summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorSterling Hughes <sterling@php.net>2001-09-17 21:02:53 +0000
committerSterling Hughes <sterling@php.net>2001-09-17 21:02:53 +0000
commitbcb426a207baf037fd5a007e48be217bdb1a7c2b (patch)
treee743d605a5997509d1995c46ce548fdd882ee204 /main/php.h
parentd6cecfc2135f0eb8cbc0d8c4fb7b96fdbc5bdd0e (diff)
downloadphp-git-bcb426a207baf037fd5a007e48be217bdb1a7c2b.tar.gz
Merge in qsort changes
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/php.h b/main/php.h
index 1436c3ac93..c7188c7513 100644
--- a/main/php.h
+++ b/main/php.h
@@ -32,6 +32,7 @@
#include "php_version.h"
#include "zend.h"
+#include "zend_qsort.h"
#include "php_compat.h"
#include "zend_API.h"
@@ -240,7 +241,7 @@ int cfgparse(void);
/* functions */
int php_startup_internal_extensions(void);
-int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *));
+int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);