Merg extern declarations:

r293721: Add extern declarations for fixing the build with some compilers (johannes)
r293730: A few more extern declarations (johannes)

diff --git a/ext/spl/spl_dllist.h b/ext/spl/spl_dllist.h
index 15713997eacd2c19e0322878be0f1ad3d17acadc..daaf55fb2039b24df7f8ef983efb8f5c5c445099 100644 (file)
--- a/ext/spl/spl_dllist.h
+++ b/ext/spl/spl_dllist.h
@@ -24,9 +24,9 @@
 #include "php.h"
 #include "php_spl.h"
 
-PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
-PHPAPI zend_class_entry *spl_ce_SplQueue;
-PHPAPI zend_class_entry *spl_ce_SplStack;
+extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
+extern PHPAPI zend_class_entry *spl_ce_SplQueue;
+extern PHPAPI zend_class_entry *spl_ce_SplStack;
 
 PHP_MINIT_FUNCTION(spl_dllist);
 

diff --git a/ext/spl/spl_fixedarray.h b/ext/spl/spl_fixedarray.h
index 62b9005fe83301f6553cb012b162f8fe9f09d32d..9931fda7c984d0be8d56c088a40291c6f5a722d2 100644 (file)
--- 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 dfa2e3b696edb3d096b478243817fe968a1a98d0..0931ba728acee849836f907d141bc4852a9479d4 100644 (file)
--- 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 043ea85295c42e42cbfe0518554ea751bfa5f890..6b08fd54dc1d0c59929f04691b68dc19dbe56ab6 100644 (file)
--- 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()