johannes                                 Tue, 19 Jan 2010 10:44:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=293721

Log:
- Add extern declarations for fixing the build with some compilers

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h
    U   php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h
    U   php/php-src/branches/PHP_5_3/main/php_getopt.h
    U   php/php-src/trunk/ext/spl/spl_fixedarray.h
    U   php/php-src/trunk/ext/spl/spl_heap.h
    U   php/php-src/trunk/main/php_getopt.h

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h       2010-01-19 
10:11:58 UTC (rev 293720)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h       2010-01-19 
10:44:36 UTC (rev 293721)
@@ -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);


Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h     2010-01-19 10:11:58 UTC 
(rev 293720)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h     2010-01-19 10:44:36 UTC 
(rev 293721)
@@ -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);


Modified: php/php-src/branches/PHP_5_3/main/php_getopt.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/php_getopt.h      2010-01-19 10:11:58 UTC 
(rev 293720)
+++ php/php-src/branches/PHP_5_3/main/php_getopt.h      2010-01-19 10:44:36 UTC 
(rev 293721)
@@ -41,7 +41,7 @@

 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()


Modified: php/php-src/trunk/ext/spl/spl_fixedarray.h
===================================================================
--- php/php-src/trunk/ext/spl/spl_fixedarray.h  2010-01-19 10:11:58 UTC (rev 
293720)
+++ php/php-src/trunk/ext/spl/spl_fixedarray.h  2010-01-19 10:44:36 UTC (rev 
293721)
@@ -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);


Modified: php/php-src/trunk/ext/spl/spl_heap.h
===================================================================
--- php/php-src/trunk/ext/spl/spl_heap.h        2010-01-19 10:11:58 UTC (rev 
293720)
+++ php/php-src/trunk/ext/spl/spl_heap.h        2010-01-19 10:44:36 UTC (rev 
293721)
@@ -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);


Modified: php/php-src/trunk/main/php_getopt.h
===================================================================
--- php/php-src/trunk/main/php_getopt.h 2010-01-19 10:11:58 UTC (rev 293720)
+++ php/php-src/trunk/main/php_getopt.h 2010-01-19 10:44:36 UTC (rev 293721)
@@ -41,7 +41,7 @@

 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()


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to