From: Johannes Schlüter Date: Tue, 19 Jan 2010 10:44:36 +0000 (+0000) Subject: - Add extern declarations for fixing the build with some compilers X-Git-Tag: php-5.4.0alpha1~191^2~2072 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14b236af80ca4b3e2827d39baeee94e7975c5d97;p=php - Add extern declarations for fixing the build with some compilers --- diff --git a/ext/spl/spl_fixedarray.h b/ext/spl/spl_fixedarray.h index f750936276..3c59469a34 100644 --- a/ext/spl/spl_fixedarray.h +++ b/ext/spl/spl_fixedarray.h @@ -22,7 +22,7 @@ #ifndef SPL_FIXEDARRAY_H #define SPL_FIXEDARRAY_H -PHPAPI zend_class_entry *spl_ce_SplFixedArray; +extern PHPAPI zend_class_entry *spl_ce_SplFixedArray; PHP_MINIT_FUNCTION(spl_fixedarray); diff --git a/ext/spl/spl_heap.h b/ext/spl/spl_heap.h index 865633bc7d..de011f1767 100644 --- a/ext/spl/spl_heap.h +++ b/ext/spl/spl_heap.h @@ -24,11 +24,11 @@ #include "php.h" #include "php_spl.h" -PHPAPI zend_class_entry *spl_ce_SplHeap; -PHPAPI zend_class_entry *spl_ce_SplMinHeap; -PHPAPI zend_class_entry *spl_ce_SplMaxHeap; +extern PHPAPI zend_class_entry *spl_ce_SplHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMinHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap; -PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; +extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; PHP_MINIT_FUNCTION(spl_heap); diff --git a/main/php_getopt.h b/main/php_getopt.h index 2416c7b8a5..a6bd82ad6b 100644 --- a/main/php_getopt.h +++ b/main/php_getopt.h @@ -41,7 +41,7 @@ typedef struct _opt_struct { BEGIN_EXTERN_C() /* holds the index of the latest fetched element from the opts array */ -PHPAPI int php_optidx; +extern PHPAPI int php_optidx; PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start); END_EXTERN_C()