diff options
| author | Johannes Schlüter <johannes@php.net> | 2010-01-19 10:44:36 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2010-01-19 10:44:36 +0000 |
| commit | 00afa7278bd2b5cafa757e89a6b104c28195c3b5 (patch) | |
| tree | c724ef4784ff038556aa5499356d35099866f408 | |
| parent | 7e1f29e930bfa26b8de04862556e1c49fc91eda7 (diff) | |
| download | php-git-00afa7278bd2b5cafa757e89a6b104c28195c3b5.tar.gz | |
- Add extern declarations for fixing the build with some compilers
| -rw-r--r-- | ext/spl/spl_fixedarray.h | 2 | ||||
| -rw-r--r-- | ext/spl/spl_heap.h | 8 | ||||
| -rw-r--r-- | main/php_getopt.h | 2 |
3 files changed, 6 insertions, 6 deletions
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() |