Index: zend_API.h
===================================================================
RCS file: /repository/Zend/zend_API.h,v
retrieving revision 1.101
diff -u -r1.101 zend_API.h
--- zend_API.h	2001/08/06 02:48:55	1.101
+++ zend_API.h	2001/08/07 17:14:30
@@ -103,10 +103,12 @@
 
 int zend_next_free_module(void);
 
+BEGIN_EXTERN_C()
 ZEND_API int zend_get_parameters(int ht, int param_count, ...);
 ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC);
 ZEND_API int zend_get_parameters_ex(int param_count, ...);
 ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC);
+END_EXTERN_C()
 
 #define zend_get_parameters_array(ht, param_count, argument_array)			\
 	_zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
@@ -117,6 +119,7 @@
 /* Parameter parsing API -- andrei */
 
 #define ZEND_PARSE_PARAMS_QUIET 1<<1
+BEGIN_EXTERN_C()
 ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
 ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
 
@@ -134,6 +137,7 @@
 
 ZEND_API void zend_wrong_param_count(TSRMLS_D);
 ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name);
+END_EXTERN_C()
 
 #define getThis() (this_ptr)
 
@@ -148,6 +152,7 @@
 #define DLEXPORT
 #endif
 
+BEGIN_EXTERN_C()
 ZEND_API int zend_startup_module(zend_module_entry *module);
 
 #define array_init(arg)			_array_init((arg) ZEND_FILE_LINE_CC)
@@ -168,6 +173,7 @@
 ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
 ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate);
 ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+END_EXTERN_C()
 
 #define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n)
 #define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
@@ -184,6 +190,7 @@
 #define add_next_index_unset(__arg) add_next_index_null(__arg)
 #define add_property_unset(__arg, __key) add_property_null(__arg, __key)
 
+BEGIN_EXTERN_C()
 ZEND_API int add_index_long(zval *arg, uint idx, long n);
 ZEND_API int add_index_null(zval *arg, uint idx);
 ZEND_API int add_index_bool(zval *arg, uint idx, int b);
@@ -221,6 +228,7 @@
 ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
 ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len,  char *str, uint length, int duplicate);
 ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+END_EXTERN_C()
 
 #define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key)+1, __n)
 #define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) + 1)
@@ -231,11 +239,13 @@
 #define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
 #define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value)       
 
+BEGIN_EXTERN_C()
 ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[] TSRMLS_DC);
 ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
 
 ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
                                   int is_ref, int num_symbol_tables, ...);
+END_EXTERN_C()
 
 #define add_method(arg,key,method)	add_assoc_function((arg),(key),(method))
 
Index: zend_list.h
===================================================================
RCS file: /repository/Zend/zend_list.h,v
retrieving revision 1.35
diff -u -r1.35 zend_list.h
--- zend_list.h	2001/08/02 06:16:20	1.35
+++ zend_list.h	2001/08/07 17:14:30
@@ -55,8 +55,11 @@
 
 
 #define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
+
+BEGIN_EXTERN_C()
 ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
 ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number);
+END_EXTERN_C()
 
 enum list_entry_type {
 	LE_DB=1000
@@ -72,6 +75,7 @@
 int zend_init_rsrc_list_dtors(void);
 void zend_destroy_rsrc_list_dtors(void);
 
+BEGIN_EXTERN_C()
 ZEND_API int zend_list_insert(void *ptr, int type);
 ZEND_API int _zend_list_addref(int id TSRMLS_DC);
 ZEND_API int _zend_list_delete(int id TSRMLS_DC);
@@ -86,6 +90,7 @@
 
 ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC);
 ZEND_API int zend_fetch_list_dtor_id(char *type_name);
+END_EXTERN_C()
 
 extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */

Index: php.h
===================================================================
RCS file: /repository/php4/main/php.h,v
retrieving revision 1.148
diff -u -r1.148 php.h
--- php.h	5 Aug 2001 16:21:32 -0000	1.148
+++ php.h	7 Aug 2001 17:16:15 -0000
@@ -83,6 +83,8 @@
  * src_size is the number of bytes excluding the NUL of src
  */
 
+BEGIN_EXTERN_C()
+
 #define PHP_STRLCPY(dst, src, size, src_size)	\
 	{											\
 		size_t php_str_len;						\
@@ -329,6 +331,8 @@
 #endif
 
 PHPAPI PHP_FUNCTION(warn_not_available);
+
+END_EXTERN_C()
 
 #endif

Index: info.h
===================================================================
RCS file: /repository/php4/ext/standard/info.h,v
retrieving revision 1.24
diff -u -r1.24 info.h
--- info.h	30 Jul 2001 09:16:46 -0000	1.24
+++ info.h	7 Aug 2001 17:18:51 -0000
@@ -55,6 +55,8 @@
 #define ZEND_LOGO_GUID		"PHPE9568F35-D428-11d2-A769-00AA001ACF42"
 #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
 
+BEGIN_EXTERN_C()
+
 PHP_FUNCTION(phpversion);
 PHP_FUNCTION(phpinfo);
 PHP_FUNCTION(phpcredits);
@@ -76,5 +78,7 @@
 PHPAPI void php_info_print_hr(void);
 
 void register_phpinfo_constants(INIT_FUNC_ARGS);
+
+END_EXTERN_C()
 
 #endif /* INFO_H */