From d3340d41a7f7b3dda42c4f841162924ef1b0f2f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Thu, 11 Feb 2010 17:24:43 +0000 Subject: [PATCH] Merg extern declarations: r293721: Add extern declarations for fixing the build with some compilers (johannes) r293730: A few more extern declarations (johannes) --- ext/spl/spl_dllist.h | 6 +++--- ext/spl/spl_fixedarray.h | 2 +- ext/spl/spl_heap.h | 8 ++++---- main/php_getopt.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/spl/spl_dllist.h b/ext/spl/spl_dllist.h index 15713997ea..daaf55fb20 100644 --- 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 62b9005fe8..9931fda7c9 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 dfa2e3b696..0931ba728a 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 043ea85295..6b08fd54dc 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() -- 2.50.1