abies Tue Sep 2 09:34:25 2003 EDT
Modified files:
/php-src/ext/standard basic_functions.c info.h
/php-src/main SAPI.h php_main.h php_variables.h
Log:
Fix use of EXTERN_C macros
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.624
php-src/ext/standard/basic_functions.c:1.625
--- php-src/ext/standard/basic_functions.c:1.624 Thu Aug 28 08:18:51 2003
+++ php-src/ext/standard/basic_functions.c Tue Sep 2 09:34:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.624 2003/08/28 12:18:51 andrey Exp $ */
+/* $Id: basic_functions.c,v 1.625 2003/09/02 13:34:22 abies Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -103,14 +103,14 @@
ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(second_and_third_args_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0)
@@ -118,21 +118,21 @@
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(first_through_third_args_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
typedef struct _php_shutdown_function_entry {
zval **arguments;
Index: php-src/ext/standard/info.h
diff -u php-src/ext/standard/info.h:1.35 php-src/ext/standard/info.h:1.36
--- php-src/ext/standard/info.h:1.35 Tue Jun 10 16:03:38 2003
+++ php-src/ext/standard/info.h Tue Sep 2 09:34:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.h,v 1.35 2003/06/10 20:03:38 imajes Exp $ */
+/* $Id: info.h,v 1.36 2003/09/02 13:34:22 abies Exp $ */
#ifndef INFO_H
#define INFO_H
@@ -83,6 +83,6 @@
PHPAPI char *php_logo_guid(void);
void register_phpinfo_constants(INIT_FUNC_ARGS);
-END_EXTERN_C();
+END_EXTERN_C()
#endif /* INFO_H */
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.104 php-src/main/SAPI.h:1.105
--- php-src/main/SAPI.h:1.104 Mon Aug 18 19:19:27 2003
+++ php-src/main/SAPI.h Tue Sep 2 09:34:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.h,v 1.104 2003/08/18 23:19:27 wez Exp $ */
+/* $Id: SAPI.h,v 1.105 2003/09/02 13:34:23 abies Exp $ */
#ifndef SAPI_H
#define SAPI_H
@@ -61,9 +61,9 @@
typedef struct _sapi_post_entry sapi_post_entry;
typedef struct _sapi_module_struct sapi_module_struct;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
extern SAPI_API sapi_module_struct sapi_module; /* true global */
-END_EXTERN_C();
+END_EXTERN_C()
/* Some values in this structure needs to be filled in before
* calling sapi_activate(). We WILL change the `char *' entries,
@@ -125,7 +125,7 @@
} sapi_globals_struct;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
#ifdef ZTS
# define SG(v) TSRMG(sapi_globals_id, sapi_globals_struct *, v)
SAPI_API extern int sapi_globals_id;
@@ -139,7 +139,7 @@
SAPI_API void sapi_activate(TSRMLS_D);
SAPI_API void sapi_deactivate(TSRMLS_D);
SAPI_API void sapi_initialize_empty_request(TSRMLS_D);
-END_EXTERN_C();
+END_EXTERN_C()
/*
* This is the preferred and maintained API for
@@ -164,7 +164,7 @@
SAPI_HEADER_SET_STATUS /* int */
} sapi_header_op_enum;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC);
/* Deprecated functions. Use sapi_header_op instead. */
@@ -197,7 +197,7 @@
SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
-END_EXTERN_C();
+END_EXTERN_C()
struct _sapi_module_struct {
char *name;
@@ -278,12 +278,12 @@
#define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval*
destArray TSRMLS_DC)
#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char
*var, char **val, unsigned int val_len TSRMLS_DC)
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter);
-END_EXTERN_C();
+END_EXTERN_C()
#define STANDARD_SAPI_MODULE_PROPERTIES
Index: php-src/main/php_main.h
diff -u php-src/main/php_main.h:1.29 php-src/main/php_main.h:1.30
--- php-src/main/php_main.h:1.29 Mon Aug 18 19:19:27 2003
+++ php-src/main/php_main.h Tue Sep 2 09:34:23 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_main.h,v 1.29 2003/08/18 23:19:27 wez Exp $ */
+/* $Id: php_main.h,v 1.30 2003/09/02 13:34:23 abies Exp $ */
#ifndef PHP_MAIN_H
#define PHP_MAIN_H
@@ -26,7 +26,7 @@
#include "php_globals.h"
#include "SAPI.h"
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
PHPAPI int php_request_startup(TSRMLS_D);
PHPAPI void php_request_shutdown(void *dummy);
PHPAPI void php_request_shutdown_for_exec(void *dummy);
@@ -53,6 +53,6 @@
/* environment module */
extern int php_init_environ(void);
extern int php_shutdown_environ(void);
-END_EXTERN_C();
+END_EXTERN_C()
#endif
Index: php-src/main/php_variables.h
diff -u php-src/main/php_variables.h:1.19 php-src/main/php_variables.h:1.20
--- php-src/main/php_variables.h:1.19 Mon Aug 18 19:19:27 2003
+++ php-src/main/php_variables.h Tue Sep 2 09:34:23 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.h,v 1.19 2003/08/18 23:19:27 wez Exp $ */
+/* $Id: php_variables.h,v 1.20 2003/09/02 13:34:23 abies Exp $ */
#ifndef PHP_VARIABLES_H
#define PHP_VARIABLES_H
@@ -30,7 +30,7 @@
#define PARSE_COOKIE 2
#define PARSE_STRING 3
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
void php_startup_auto_globals(TSRMLS_D);
extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
@@ -40,7 +40,7 @@
PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array
TSRMLS_DC);
int php_hash_environment(TSRMLS_D);
-END_EXTERN_C();
+END_EXTERN_C()
#define NUM_TRACK_VARS 6
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
