prefix internal API; ensure raphf is built first in-tree

[m6w6/ext-pq] / src / php_pq_misc.c

diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
index 7dfd2a52bb88f2227283697ec8d667a4b156ad01..d36f905e8e625dd6c9a3d9a87e637687d34f2bbb 100644 (file)
--- a/src/php_pq_misc.c
+++ b/src/php_pq_misc.c
@@ -17,9 +17,6 @@
 #include <php.h>
 #include <ext/date/php_date.h>
 #include <ext/standard/php_string.h>
 #include <php.h>
 #include <ext/date/php_date.h>
 #include <ext/standard/php_string.h>

-#if defined(HAVE_JSON) && !defined(COMPILE_DL_JSON)
-#      include <ext/json/php_json.h>
-#endif

 
 #include <Zend/zend_interfaces.h>
 
 
 #include <Zend/zend_interfaces.h>
 


@@ -28,7 +25,7 @@
 #include "php_pq.h"
 #include "php_pq_misc.h"
 
 #include "php_pq.h"
 #include "php_pq_misc.h"
 

-char *rtrim(char *e)
+char *php_pq_rtrim(char *e)

 {
        size_t l = strlen(e);
 
 {
        size_t l = strlen(e);
 


@@ -38,7 +35,7 @@ char *rtrim(char *e)
        return e;
 }
 
        return e;
 }
 

-const char *strmode(long mode)
+const char *php_pq_strmode(long mode)

 {
        switch (mode & (INV_READ|INV_WRITE)) {
        case INV_READ|INV_WRITE:
 {
        switch (mode & (INV_READ|INV_WRITE)) {
        case INV_READ|INV_WRITE:


@@ -52,7 +49,7 @@ const char *strmode(long mode)
        }
 }
 
        }
 }
 

-int compare_index(const void *lptr, const void *rptr TSRMLS_DC)
+int php_pq_compare_index(const void *lptr, const void *rptr TSRMLS_DC)

 {
        const Bucket *l = *(const Bucket **) lptr;
        const Bucket *r = *(const Bucket **) rptr;
 {
        const Bucket *l = *(const Bucket **) lptr;
        const Bucket *r = *(const Bucket **) rptr;