cvs: php4 /ext/aspell php_aspell.h /ext/calendar php_calendar.h /ext/dba php_dba.h /ext/dbase php_dbase.h /ext/filepro php_filepro.h /ext/gettext
php_gettext.h /ext/hyperwave php_hyperwave.h /ext/icap php_icap.h /ext/imap php_imap.h /ext/informix php_informix.h /ext/interbase
php_interbase.h /ext/mcal php_mcal.h /ext/skeleton php_skeleton.h /ext/standard base64.h md5.h pageinfo.h php_filestat.h php_image.h php_iptc.h
php_mail.h php_math.h php_metaphone.h php_output.h php_string.h php_var.h scanf.h /ext/sybase php_sybase_db.h /ext/wddx php_wddx.h

sas Sun Jul 2 17:41:19 2000 EDT Modified files: /php4/ext/aspell php_aspell.h /php4/ext/calendar php_calendar.h /php4/ext/dba php_dba.h /php4/ext/dbase php_dbase.h /php4/ext/filepro php_filepro.h /php4/ext/gettext php_gettext.h /php4/ext/hyperwave php_hyperwave.h /php4/ext/icap php_icap.h /php4/ext/imap php_imap.h /php4/ext/informix php_informix.h /php4/ext/interbase php_interbase.h /php4/ext/mcal php_mcal.h /php4/ext/skeleton php_skeleton.h /php4/ext/standard base64.h md5.h pageinfo.h php_filestat.h php_image.h php_iptc.h php_mail.h php_math.h php_metaphone.h php_output.h php_string.h php_var.h scanf.h /php4/ext/sybase php_sybase_db.h /php4/ext/wddx php_wddx.h Log: Rename macros which begin with underscore to appropiate macros. The general rule is: macro_name=echo $filename|tr a-z A-Z|sed 's/\./_/' Index: php4/ext/aspell/php_aspell.h diff -u php4/ext/aspell/php_aspell.h:1.3 php4/ext/aspell/php_aspell.h:1.4 --- php4/ext/aspell/php_aspell.h:1.3 Fri Dec 17 13:13:13 1999 +++ php4/ext/aspell/php_aspell.h Sun Jul 2 17:41:13 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_aspell.h,v 1.3 1999/12/17 21:13:13 zeev Exp $ */ +/* $Id: php_aspell.h,v 1.4 2000/07/03 00:41:13 sas Exp $ */ -#ifndef _ASPELL_H -#define _ASPELL_H +#ifndef PHP_ASPELL_H +#define PHP_ASPELL_H #if HAVE_ASPELL extern zend_module_entry aspell_module_entry; #define aspell_module_ptr &aspell_module_entry @@ -50,4 +50,4 @@ #define phpext_aspell_ptr aspell_module_ptr -#endif /* _ASPELL_H */ +#endif /* PHP_ASPELL_H */ Index: php4/ext/calendar/php_calendar.h diff -u php4/ext/calendar/php_calendar.h:1.2 php4/ext/calendar/php_calendar.h:1.3 --- php4/ext/calendar/php_calendar.h:1.2 Sun Apr 16 04:40:19 2000 +++ php4/ext/calendar/php_calendar.h Sun Jul 2 17:41:13 2000 @@ -1,5 +1,5 @@ -#ifndef _INCLUDED_CALENDAR_H -#define _INCLUDED_CALENDAR_H +#ifndef PHP_CALENDAR_H +#define PHP_CALENDAR_H Index: php4/ext/dba/php_dba.h diff -u php4/ext/dba/php_dba.h:1.4 php4/ext/dba/php_dba.h:1.5 --- php4/ext/dba/php_dba.h:1.4 Tue Jun 27 15:25:27 2000 +++ php4/ext/dba/php_dba.h Sun Jul 2 17:41:13 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dba.h,v 1.4 2000/06/27 22:25:27 jah Exp $ */ +/* $Id: php_dba.h,v 1.5 2000/07/03 00:41:13 sas Exp $ */ -#ifndef _DBA_H -#define _DBA_H +#ifndef PHP_DBA_H +#define PHP_DBA_H #if HAVE_DBA Index: php4/ext/dbase/php_dbase.h diff -u php4/ext/dbase/php_dbase.h:1.4 php4/ext/dbase/php_dbase.h:1.5 --- php4/ext/dbase/php_dbase.h:1.4 Fri Dec 17 12:54:52 1999 +++ php4/ext/dbase/php_dbase.h Sun Jul 2 17:41:14 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dbase.h,v 1.4 1999/12/17 20:54:52 zeev Exp $ */ +/* $Id: php_dbase.h,v 1.5 2000/07/03 00:41:14 sas Exp $ */ -#ifndef _DBASE_H -#define _DBASE_H +#ifndef PHP_DBASE_H +#define PHP_DBASE_H #if DBASE extern zend_module_entry dbase_module_entry; #define dbase_module_ptr &dbase_module_entry @@ -52,4 +52,4 @@ #define phpext_dbase_ptr dbase_module_ptr -#endif /* _DBASE_H */ +#endif /* PHP_DBASE_H */ Index: php4/ext/filepro/php_filepro.h diff -u php4/ext/filepro/php_filepro.h:1.3 php4/ext/filepro/php_filepro.h:1.4 --- php4/ext/filepro/php_filepro.h:1.3 Fri Dec 17 12:54:56 1999 +++ php4/ext/filepro/php_filepro.h Sun Jul 2 17:41:14 2000 @@ -34,10 +34,10 @@ */ -/* $Id: php_filepro.h,v 1.3 1999/12/17 20:54:56 zeev Exp $ */ +/* $Id: php_filepro.h,v 1.4 2000/07/03 00:41:14 sas Exp $ */ -#ifndef _FILEPRO_H -#define _FILEPRO_H +#ifndef PHP_FILEPRO_H +#define PHP_FILEPRO_H #if HAVE_FILEPRO extern zend_module_entry filepro_module_entry; #define phpext_filepro_ptr &filepro_module_entry @@ -55,4 +55,4 @@ #else #define phpext_filepro_ptr NULL #endif -#endif /* _FILEPRO_H */ +#endif /* PHP_FILEPRO_H */ Index: php4/ext/gettext/php_gettext.h diff -u php4/ext/gettext/php_gettext.h:1.5 php4/ext/gettext/php_gettext.h:1.6 --- php4/ext/gettext/php_gettext.h:1.5 Sat Mar 11 12:57:33 2000 +++ php4/ext/gettext/php_gettext.h Sun Jul 2 17:41:14 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.5 2000/03/11 20:57:33 andi Exp $ */ +/* $Id: php_gettext.h,v 1.6 2000/07/03 00:41:14 sas Exp $ */ -#ifndef _GETTEXT_H -#define _GETTEXT_H +#ifndef PHP_GETTEXT_H +#define PHP_GETTEXT_H #if HAVE_LIBINTL #ifndef INIT_FUNC_ARGS @@ -54,4 +54,4 @@ #define phpext_gettext_ptr gettext_module_ptr -#endif /* _GETTEXT_H */ +#endif /* PHP_GETTEXT_H */ Index: php4/ext/hyperwave/php_hyperwave.h diff -u php4/ext/hyperwave/php_hyperwave.h:1.7 php4/ext/hyperwave/php_hyperwave.h:1.8 --- php4/ext/hyperwave/php_hyperwave.h:1.7 Fri Jun 30 02:46:38 2000 +++ php4/ext/hyperwave/php_hyperwave.h Sun Jul 2 17:41:14 2000 @@ -23,10 +23,10 @@ */ -/* $Id: php_hyperwave.h,v 1.7 2000/06/30 09:46:38 steinm Exp $ */ +/* $Id: php_hyperwave.h,v 1.8 2000/07/03 00:41:14 sas Exp $ */ -#ifndef _HW_H -#define _HW_H +#ifndef PHP_HYPERWAVE_H +#define PHP_HYPERWAVE_H #ifdef PHP_WIN32 #define PHP_HW_API __declspec(dllexport) @@ -155,5 +155,5 @@ #define hw_module_ptr NULL #endif /* HYPERWAVE */ #define phpext_hyperwave_ptr hw_module_ptr -#endif /* _HW_H */ +#endif /* PHP_HYPERWAVE_H */ Index: php4/ext/icap/php_icap.h diff -u php4/ext/icap/php_icap.h:1.4 php4/ext/icap/php_icap.h:1.5 --- php4/ext/icap/php_icap.h:1.4 Sat Jun 10 01:47:56 2000 +++ php4/ext/icap/php_icap.h Sun Jul 2 17:41:15 2000 @@ -1,7 +1,7 @@ -/* $Id: php_icap.h,v 1.4 2000/06/10 08:47:56 andi Exp $ */ +/* $Id: php_icap.h,v 1.5 2000/07/03 00:41:15 sas Exp $ */ -#ifndef _INCLUDED_ICAP_H -#define _INCLUDED_ICAP_H +#ifndef PHP_ICAP_H +#define PHP_ICAP_H #if HAVE_ICAP Index: php4/ext/imap/php_imap.h diff -u php4/ext/imap/php_imap.h:1.3 php4/ext/imap/php_imap.h:1.4 --- php4/ext/imap/php_imap.h:1.3 Tue May 30 15:13:09 2000 +++ php4/ext/imap/php_imap.h Sun Jul 2 17:41:15 2000 @@ -1,5 +1,5 @@ -#ifndef _INCLUDED_IMAP_H -#define _INCLUDED_IMAP_H +#ifndef PHP_IMAP_H +#define PHP_IMAP_H #ifndef PHP_WIN32 Index: php4/ext/informix/php_informix.h diff -u php4/ext/informix/php_informix.h:1.9 php4/ext/informix/php_informix.h:1.10 --- php4/ext/informix/php_informix.h:1.9 Sat Jun 10 01:47:57 2000 +++ php4/ext/informix/php_informix.h Sun Jul 2 17:41:15 2000 @@ -31,8 +31,8 @@ */ -#ifndef _PHP_IFX_H -#define _PHP_IFX_H +#ifndef PHP_INFORMIX_H +#define PHP_INFORMIX_H #ifdef PHP_WIN32 #define PHP_IFX_API __declspec(dllexport) @@ -222,4 +222,4 @@ #define phpext_informix_ptr ifx_module_ptr -#endif /* _PHP_IFX_H */ +#endif /* PHP_INFORMIX_H */ Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.13 php4/ext/interbase/php_interbase.h:1.14 --- php4/ext/interbase/php_interbase.h:1.13 Sat Jun 24 09:24:29 2000 +++ php4/ext/interbase/php_interbase.h Sun Jul 2 17:41:16 2000 @@ -17,10 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.13 2000/06/24 16:24:29 jah Exp $ */ +/* $Id: php_interbase.h,v 1.14 2000/07/03 00:41:16 sas Exp $ */ -#ifndef _PHP_IBASE_H -#define _PHP_IBASE_H +#ifndef PHP_INTERBASE_H +#define PHP_INTERBASE_H #if HAVE_IBASE #include <ibase.h> @@ -171,7 +171,7 @@ #endif /* HAVE_IBASE */ -#endif /* _PHP_IBASE_H */ +#endif /* PHP_INTERBASE_H */ /* * Local variables: Index: php4/ext/mcal/php_mcal.h diff -u php4/ext/mcal/php_mcal.h:1.8 php4/ext/mcal/php_mcal.h:1.9 --- php4/ext/mcal/php_mcal.h:1.8 Wed Jun 14 05:28:20 2000 +++ php4/ext/mcal/php_mcal.h Sun Jul 2 17:41:16 2000 @@ -1,7 +1,7 @@ -/* $Id: php_mcal.h,v 1.8 2000/06/14 12:28:20 thies Exp $ */ +/* $Id: php_mcal.h,v 1.9 2000/07/03 00:41:16 sas Exp $ */ -#ifndef _INCLUDED_MCAL_H -#define _INCLUDED_MCAL_H +#ifndef PHP_MCAL_H +#define PHP_MCAL_H #if HAVE_MCAL Index: php4/ext/skeleton/php_skeleton.h diff -u php4/ext/skeleton/php_skeleton.h:1.8 php4/ext/skeleton/php_skeleton.h:1.9 --- php4/ext/skeleton/php_skeleton.h:1.8 Wed Jun 14 18:57:23 2000 +++ php4/ext/skeleton/php_skeleton.h Sun Jul 2 17:41:16 2000 @@ -1,7 +1,7 @@ /* __header_here__ */ -#ifndef _PHP_EXTNAME_H -#define _PHP_EXTNAME_H +#ifndef PHP_EXTNAME_H +#define PHP_EXTNAME_H /* You should tweak config.m4 so this symbol (or some else suitable) gets defined. @@ -59,6 +59,6 @@ #endif -#endif /* _PHP_EXTNAME_H */ +#endif /* PHP_EXTNAME_H */ /* __footer_here__ */ Index: php4/ext/standard/base64.h diff -u php4/ext/standard/base64.h:1.4 php4/ext/standard/base64.h:1.5 --- php4/ext/standard/base64.h:1.4 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/base64.h Sun Jul 2 17:41:16 2000 @@ -26,10 +26,10 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h,v 1.4 1999/12/17 20:55:24 zeev Exp $ */ +/* $Id: base64.h,v 1.5 2000/07/03 00:41:16 sas Exp $ */ -#ifndef _BASE64_h -#define _BASE64_h +#ifndef BASE64_H +#define BASE64_H PHP_FUNCTION(base64_decode); PHP_FUNCTION(base64_encode); @@ -37,7 +37,7 @@ extern unsigned char *php_base64_encode(const unsigned char *, int, int *); extern unsigned char *php_base64_decode(const unsigned char *, int, int *); -#endif /* _BASE64_h */ +#endif /* BASE64_H */ /* * Local variables: Index: php4/ext/standard/md5.h diff -u php4/ext/standard/md5.h:1.5 php4/ext/standard/md5.h:1.6 --- php4/ext/standard/md5.h:1.5 Mon Jun 5 16:59:06 2000 +++ php4/ext/standard/md5.h Sun Jul 2 17:41:17 2000 @@ -26,8 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -#ifndef _md5_h -#define _md5_h +#ifndef MD5_H +#define MD5_H /* MD5.H - header file for MD5C.C */ Index: php4/ext/standard/pageinfo.h diff -u php4/ext/standard/pageinfo.h:1.3 php4/ext/standard/pageinfo.h:1.4 --- php4/ext/standard/pageinfo.h:1.3 Fri Dec 17 11:51:29 1999 +++ php4/ext/standard/pageinfo.h Sun Jul 2 17:41:17 2000 @@ -1,5 +1,5 @@ -#ifndef _PROCESS_H -#define _PROCESS_H +#ifndef PAGEINFO_H +#define PAGEINFO_H PHP_FUNCTION(getmyuid); PHP_FUNCTION(getmypid); Index: php4/ext/standard/php_filestat.h diff -u php4/ext/standard/php_filestat.h:1.5 php4/ext/standard/php_filestat.h:1.6 --- php4/ext/standard/php_filestat.h:1.5 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/php_filestat.h Sun Jul 2 17:41:17 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_filestat.h,v 1.5 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: php_filestat.h,v 1.6 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _FILESTAT_H -#define _FILESTAT_H +#ifndef PHP_FILESTAT_H +#define PHP_FILESTAT_H PHP_RINIT_FUNCTION(filestat); PHP_RSHUTDOWN_FUNCTION(filestat); @@ -61,4 +61,4 @@ PHP_FUNCTION(touch); PHP_FUNCTION(clearstatcache); -#endif /* _FILESTAT_H */ +#endif /* PHP_FILESTAT_H */ Index: php4/ext/standard/php_image.h diff -u php4/ext/standard/php_image.h:1.4 php4/ext/standard/php_image.h:1.5 --- php4/ext/standard/php_image.h:1.4 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_image.h Sun Jul 2 17:41:17 2000 @@ -16,11 +16,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_image.h,v 1.4 2000/05/18 15:34:35 zeev Exp $ */ +/* $Id: php_image.h,v 1.5 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _IMAGE_H -#define _IMAGE_H +#ifndef PHP_IMAGE_H +#define PHP_IMAGE_H PHP_FUNCTION(getimagesize); -#endif /* _IMAGE_H */ +#endif /* PHP_IMAGE_H */ Index: php4/ext/standard/php_iptc.h diff -u php4/ext/standard/php_iptc.h:1.1 php4/ext/standard/php_iptc.h:1.2 --- php4/ext/standard/php_iptc.h:1.1 Sat Dec 4 11:16:04 1999 +++ php4/ext/standard/php_iptc.h Sun Jul 2 17:41:17 2000 @@ -28,12 +28,12 @@ */ -/* $Id: php_iptc.h,v 1.1 1999/12/04 19:16:04 sas Exp $ */ +/* $Id: php_iptc.h,v 1.2 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _PHPIPTC_H -#define _PHPIPTC_H +#ifndef PHP_IPTC_H +#define PHP_IPTC_H PHP_FUNCTION(iptcparse); PHP_FUNCTION(iptcembed); -#endif /* _PHPIPTC_H */ +#endif /* PHP_IPTC_H */ Index: php4/ext/standard/php_mail.h diff -u php4/ext/standard/php_mail.h:1.5 php4/ext/standard/php_mail.h:1.6 --- php4/ext/standard/php_mail.h:1.5 Thu Jun 29 07:07:10 2000 +++ php4/ext/standard/php_mail.h Sun Jul 2 17:41:17 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_mail.h,v 1.5 2000/06/29 14:07:10 kk Exp $ */ +/* $Id: php_mail.h,v 1.6 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _MAIL_H -#define _MAIL_H +#ifndef PHP_MAIL_H +#define PHP_MAIL_H #if HAVE_SENDMAIL @@ -42,4 +42,4 @@ #endif -#endif /* _MAIL_H */ +#endif /* PHP_MAIL_H */ Index: php4/ext/standard/php_math.h diff -u php4/ext/standard/php_math.h:1.2 php4/ext/standard/php_math.h:1.3 --- php4/ext/standard/php_math.h:1.2 Tue Jun 13 09:35:40 2000 +++ php4/ext/standard/php_math.h Sun Jul 2 17:41:17 2000 @@ -29,10 +29,10 @@ */ -/* $Id: php_math.h,v 1.2 2000/06/13 16:35:40 sas Exp $ */ +/* $Id: php_math.h,v 1.3 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _PHPMATH_H -#define _PHPMATH_H +#ifndef PHP_MATH_H +#define PHP_MATH_H PHP_FUNCTION(sin); PHP_FUNCTION(cos); PHP_FUNCTION(tan); @@ -121,4 +121,4 @@ #define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ #endif -#endif /* _PHPMATH_H */ +#endif /* PHP_MATH_H */ Index: php4/ext/standard/php_metaphone.h diff -u php4/ext/standard/php_metaphone.h:1.7 php4/ext/standard/php_metaphone.h:1.8 --- php4/ext/standard/php_metaphone.h:1.7 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_metaphone.h Sun Jul 2 17:41:17 2000 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_metaphone.h,v 1.7 2000/05/18 15:34:35 zeev Exp $ */ +/* $Id: php_metaphone.h,v 1.8 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _php_metaphone_h -#define _php_metaphone_h +#ifndef PHP_METAPHONE_H +#define PHP_METAPHONE_H PHP_FUNCTION(metaphone); Index: php4/ext/standard/php_output.h diff -u php4/ext/standard/php_output.h:1.10 php4/ext/standard/php_output.h:1.11 --- php4/ext/standard/php_output.h:1.10 Sat Jun 24 06:27:34 2000 +++ php4/ext/standard/php_output.h Sun Jul 2 17:41:17 2000 @@ -17,8 +17,8 @@ */ -#ifndef _OUTPUT_BUFFER -#define _OUTPUT_BUFFER +#ifndef PHP_OUTPUT_H +#define PHP_OUTPUT_H #include "php.h" @@ -69,4 +69,4 @@ #endif -#endif /* _OUTPUT_BUFFER */ +#endif /* PHP_OUTPUT_H */ Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.21 php4/ext/standard/php_string.h:1.22 --- php4/ext/standard/php_string.h:1.21 Tue Jun 6 13:42:33 2000 +++ php4/ext/standard/php_string.h Sun Jul 2 17:41:17 2000 @@ -29,12 +29,12 @@ */ -/* $Id: php_string.h,v 1.21 2000/06/06 20:42:33 andrei Exp $ */ +/* $Id: php_string.h,v 1.22 2000/07/03 00:41:17 sas Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ -#ifndef _PHPSTRING_H -#define _PHPSTRING_H +#ifndef PHP_STRING_H +#define PHP_STRING_H PHP_FUNCTION(strspn); PHP_FUNCTION(strcspn); @@ -123,4 +123,4 @@ #define strerror php_strerror #endif -#endif /* _PHPSTRING_H */ +#endif /* PHP_STRING_H */ Index: php4/ext/standard/php_var.h diff -u php4/ext/standard/php_var.h:1.2 php4/ext/standard/php_var.h:1.3 --- php4/ext/standard/php_var.h:1.2 Wed Jun 21 11:22:22 2000 +++ php4/ext/standard/php_var.h Sun Jul 2 17:41:17 2000 @@ -28,8 +28,8 @@ */ -#ifndef _PHPVAR_H -#define _PHPVAR_H +#ifndef PHP_VAR_H +#define PHP_VAR_H PHP_FUNCTION(var_dump); PHP_FUNCTION(serialize); @@ -41,4 +41,4 @@ PHPAPI zend_class_entry *php_create_empty_class(char *class_name,int len); -#endif /* _PHPVAR_H */ +#endif /* PHP_VAR_H */ Index: php4/ext/standard/scanf.h diff -u php4/ext/standard/scanf.h:1.1 php4/ext/standard/scanf.h:1.2 --- php4/ext/standard/scanf.h:1.1 Tue Jun 6 11:58:15 2000 +++ php4/ext/standard/scanf.h Sun Jul 2 17:41:17 2000 @@ -15,8 +15,8 @@ | Authors: clayton collie <clcollie@mindspring.com> | +----------------------------------------------------------------------+ */ -#ifndef _SCAN_H_ -#define _SCAN_H_ +#ifndef SCANF_H +#define SCANF_H #define SCAN_MAX_ARGS 0xFF /* Maximum number of variable which can be */ @@ -45,4 +45,4 @@ inline void scan_set_error_return(int numVars,pval **return_value); -#endif /* ifndef _SCAN_PHP_ */ +#endif /* SCANF_H */ Index: php4/ext/sybase/php_sybase_db.h diff -u php4/ext/sybase/php_sybase_db.h:1.1 php4/ext/sybase/php_sybase_db.h:1.2 --- php4/ext/sybase/php_sybase_db.h:1.1 Fri Jun 30 09:24:16 2000 +++ php4/ext/sybase/php_sybase_db.h Sun Jul 2 17:41:17 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_sybase_db.h,v 1.1 2000/06/30 16:24:16 zeev Exp $ */ +/* $Id: php_sybase_db.h,v 1.2 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _PHP_SYBASE_H -#define _PHP_SYBASE_H +#ifndef PHP_SYBASE_DB_H +#define PHP_SYBASE_DB_H #if HAVE_SYBASE @@ -135,4 +135,4 @@ #define phpext_sybase_ptr sybase_module_ptr -#endif /* _PHP_SYBASE_H */ +#endif /* PHP_SYBASE_DB_H */ Index: php4/ext/wddx/php_wddx.h diff -u php4/ext/wddx/php_wddx.h:1.3 php4/ext/wddx/php_wddx.h:1.4 --- php4/ext/wddx/php_wddx.h:1.3 Fri Oct 1 07:54:55 1999 +++ php4/ext/wddx/php_wddx.h Sun Jul 2 17:41:17 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_wddx.h,v 1.3 1999/10/01 14:54:55 andrei Exp $ */ +/* $Id: php_wddx.h,v 1.4 2000/07/03 00:41:17 sas Exp $ */ -#ifndef _WDDX_H -#define _WDDX_H +#ifndef PHP_WDDX_H +#define PHP_WDDX_H #if HAVE_WDDX @@ -56,4 +56,4 @@ #define phpext_wddx_ptr wddx_module_ptr -#endif /* !_WDDX_H */ +#endif /* !PHP_WDDX_H */