Skip to content

Commit

Permalink
Change header protection macros to conform to standard.
Browse files Browse the repository at this point in the history
Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment"

  All identifiers that begin with an underscore and either an uppercase
  letter or another underscore are always reserved for any use by the
  implementation.
  • Loading branch information
Sascha Schumann committed Jul 2, 2000
1 parent 8adf849 commit 16017f6
Show file tree
Hide file tree
Showing 93 changed files with 263 additions and 260 deletions.
6 changes: 3 additions & 3 deletions ext/bcmath/php_bcmath.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

/* $Id$ */

#ifndef _PHP_BCMATH_H
#define _PHP_BCMATH_H
#ifndef PHP_BCMATH_H
#define PHP_BCMATH_H

#if WITH_BCMATH

Expand All @@ -56,4 +56,4 @@ PHP_FUNCTION(bcscale);

#endif

#endif /* _PHP_BCMATH_H */
#endif /* PHP_BCMATH_H */
6 changes: 3 additions & 3 deletions ext/calendar/sdncal.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _INCLUDED_SDNCAL_H
#define _INCLUDED_SDNCAL_H
#ifndef SDNCAL_H
#define SDNCAL_H
/*
* This code has been modified for use with PHP
* by Shane Caraveo [email protected]
Expand Down Expand Up @@ -93,4 +93,4 @@ int DayOfWeek(long int sdn);
extern char *DayNameShort[7];
extern char *DayNameLong[7];

#endif /* _INCLUDED_SDNCAL_H */
#endif /* SDNCAL_H */
6 changes: 3 additions & 3 deletions ext/com/php_COM.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_COM_H
#define _PHP_COM_H
#ifndef PHP_COM_H
#define PHP_COM_H

#if WIN32|WINNT

Expand All @@ -21,4 +21,4 @@ extern zend_module_entry COM_module_entry;

#define phpext_COM_ptr COM_module_ptr

#endif /* _PHP_COM_H */
#endif /* PHP_COM_H */
4 changes: 2 additions & 2 deletions ext/cpdf/php_cpdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/
/* $Id$ */

#ifndef _PHP_CPDF_H
#define _PHP_CPDF_H
#ifndef PHP_CPDF_H
#define PHP_CPDF_H

#if HAVE_CPDFLIB

Expand Down
4 changes: 2 additions & 2 deletions ext/cybercash/cybercash.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
+----------------------------------------------------------------------+
*/

#ifndef _CYBERCASH_H
#define _CYBERCASH_H
#ifndef CYBERCASH_H
#define CYBERCASH_H


#if HAVE_MCK
Expand Down
16 changes: 8 additions & 8 deletions ext/dav/php_dav.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

/* $Id */

#ifndef _PHP_DAV_H
# define _PHP_DAV_H
#ifndef PHP_DAV_H
#define PHP_DAV_H

# if HAVE_MOD_DAV
#if HAVE_MOD_DAV

typedef struct {
int foo;
Expand All @@ -41,21 +41,21 @@ typedef struct {
} phpdav_module;

extern zend_module_entry phpdav_module_entry;
# define phpdav_module_ptr &phpdav_module_entry
#define phpdav_module_ptr &phpdav_module_entry

int phpdav_mkcol_test_handler(request_rec *);

PHP_FUNCTION(dav_set_mkcol_handlers);

# else /* !HAVE_MOD_DAV */
#else /* !HAVE_MOD_DAV */

# define phpdav_module_ptr NULL
#define phpdav_module_ptr NULL

# endif /* HAVE_MOD_DAV */
#endif /* HAVE_MOD_DAV */

#define phpext_dav_ptr phpdav_module_ptr

#endif /* _PHP_DAV_H */
#endif /* PHP_DAV_H */


/*
Expand Down
6 changes: 3 additions & 3 deletions ext/db/php_db.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
/* $Id$ */


#ifndef _PHP_DB_H
#define _PHP_DB_H
#ifndef PHP_DB_H
#define PHP_DB_H


#ifndef DLEXPORT
Expand Down Expand Up @@ -89,4 +89,4 @@ PHP_FUNCTION(dbmdelete);
PHP_FUNCTION(dbmfirstkey);
PHP_FUNCTION(dbmnextkey);

#endif /* _PHP_DB_H */
#endif /* PHP_DB_H */
4 changes: 2 additions & 2 deletions ext/dba/php_cdb.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_CDB_H
#define _PHP_CDB_H
#ifndef PHP_CDB_H
#define PHP_CDB_H

#if DBA_CDB

Expand Down
4 changes: 2 additions & 2 deletions ext/dba/php_db2.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_DB2_H
#define _PHP_DB2_H
#ifndef PHP_DB2_H
#define PHP_DB2_H

#if DBA_DB2

Expand Down
4 changes: 2 additions & 2 deletions ext/dba/php_db3.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_DB3_H
#define _PHP_DB3_H
#ifndef PHP_DB3_H
#define PHP_DB3_H

#if DBA_DB3

Expand Down
4 changes: 2 additions & 2 deletions ext/dba/php_dbm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_DBM_H
#define _PHP_DBM_H
#ifndef PHP_DBM_H
#define PHP_DBM_H

#if DBA_DBM

Expand Down
4 changes: 2 additions & 2 deletions ext/dba/php_gdbm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_GDBM_H
#define _PHP_GDBM_H
#ifndef PHP_GDBM_H
#define PHP_GDBM_H

#if DBA_GDBM

Expand Down
4 changes: 2 additions & 2 deletions ext/dba/php_ndbm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_NDBM_H
#define _PHP_NDBM_H
#ifndef PHP_NDBM_H
#define PHP_NDBM_H

#if DBA_NDBM

Expand Down
6 changes: 3 additions & 3 deletions ext/dbase/dbf.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* (c) 1986 John Wiley & Sons, Inc.
*/

#ifndef _DBF_H_
#define _DBF_H_
#ifndef DBF_H_
#define DBF_H_

#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -91,4 +91,4 @@ typedef struct db_head dbhead_t;
#include "dbf_misc.h"
#include "dbf_rec.h"

#endif /* _DBF_H_ */
#endif /* DBF_H_ */
6 changes: 3 additions & 3 deletions ext/dbase/dbf_ndx.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* by Rick Spence
*/

#ifndef _DBF_NDX_H_
#define _DBF_NDX_H_
#ifndef DBF_NDX_H_
#define DBF_NDX_H_

#include "dbf.h"

Expand Down Expand Up @@ -95,4 +95,4 @@ extern ndx_header_t *ndx_get_header(int);
extern ndx_record_t *ndx_get_first_rec(ndx_header_t *);
extern ndx_record_t *ndx_get_next_rec(ndx_header_t *, ndx_record_t *);

#endif /* _DBF_NDX_H_ */
#endif /* DBF_NDX_H_ */
4 changes: 2 additions & 2 deletions ext/domxml/php_domxml.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

/* $Id$ */

#ifndef _PHP_DOMXML_H
#define _PHP_DOMXML_H
#ifndef PHP_DOMXML_H
#define PHP_DOMXML_H

#if HAVE_DOMXML
#include <libxml/parser.h>
Expand Down
6 changes: 3 additions & 3 deletions ext/ereg/php_ereg.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

/* $Id$ */

#ifndef _REG_H
#define _REG_H
#ifndef REG_H
#define REG_H

char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended);

Expand Down Expand Up @@ -68,4 +68,4 @@ PHP_MINFO_FUNCTION(regex);
#define REGLS_FETCH()
#endif

#endif /* _REG_H */
#endif /* REG_H */
6 changes: 3 additions & 3 deletions ext/ereg/php_regex.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PHP_REGEX_H
#define _PHP_REGEX_H
#ifndef PHP_REGEX_H
#define PHP_REGEX_H

/*
* REGEX means:
Expand Down Expand Up @@ -39,4 +39,4 @@
#endif
#endif

#endif /* _PHP_REGEX_H */
#endif /* PHP_REGEX_H */
6 changes: 3 additions & 3 deletions ext/fdf/php_fdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/
/* $Id$ */

#ifndef _PHP_FDF_H
#define _PHP_FDF_H
#ifndef PHP_FDF_H
#define PHP_FDF_H

#if HAVE_FDFLIB
#if WIN32|WINNT
Expand Down Expand Up @@ -62,4 +62,4 @@ PHP_FUNCTION(fdf_add_template);
#else
#define phpext_fdf_ptr NULL
#endif
#endif /* _PHP_FDF_H */
#endif /* PHP_FDF_H */
4 changes: 2 additions & 2 deletions ext/ftp/ftp.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

/* $Id$ */

#ifndef _FTP_H
#define _FTP_H
#ifndef FTP_H
#define FTP_H

#include <stdio.h>
#ifdef HAVE_NETINET_IN_H
Expand Down
6 changes: 3 additions & 3 deletions ext/gd/php_gd.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

/* $Id$ */

#ifndef _PHP_GD_H
#define _PHP_GD_H
#ifndef PHP_GD_H
#define PHP_GD_H

#define HAVE_GDIMAGECREATEFROMPNG 1

Expand Down Expand Up @@ -159,4 +159,4 @@ static void _php_image_output_wbmp(gdImagePtr im, FILE *fp);

#endif

#endif /* _PHP_GD_H */
#endif /* PHP_GD_H */
9 changes: 6 additions & 3 deletions ext/hyperwave/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
* -----------------
*
* $Log$
* Revision 1.1 1999/04/21 23:37:47 ssb
* moved db
*
* Revision 1.1.1.1 1999/04/07 21:03:29 zeev
* PHP 4.0
*
Expand Down Expand Up @@ -49,8 +52,8 @@
*
****************************************************************************/

#ifndef __DEBUG_H
#define __DEBUG_H
#ifndef DEBUG_H
#define DEBUG_H

#ifdef DEBUG
# define D(x) x
Expand Down Expand Up @@ -191,4 +194,4 @@ typedef int bool;
#define NO 0
#define YES 1

#endif __DEBUG_H
#endif /* DEBUG_H */
4 changes: 2 additions & 2 deletions ext/hyperwave/hg_comm.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

/* $Id$ */

#ifndef _HG_COMM_H
#define _HG_COMM_H
#ifndef HG_COMM_H
#define HG_COMM_H

#if HYPERWAVE

Expand Down
4 changes: 2 additions & 2 deletions ext/hyperwave/hw_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@


/* $Id$ */
#ifndef _HW_ERROR_H
#define _HW_ERROR_H
#ifndef HW_ERROR_H
#define HW_ERROR_H

#if HYPERWAVE

Expand Down
6 changes: 3 additions & 3 deletions ext/ldap/php_ldap.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

/* $Id$ */

#ifndef _PHP_LDAP_H
#define _PHP_LDAP_H
#ifndef PHP_LDAP_H
#define PHP_LDAP_H

#include <lber.h>
#include <ldap.h>
Expand Down Expand Up @@ -113,4 +113,4 @@ ZEND_END_MODULE_GLOBALS(ldap)

#define phpext_ldap_ptr ldap_module_ptr

#endif /* _PHP_LDAP_H */
#endif /* PHP_LDAP_H */
6 changes: 3 additions & 3 deletions ext/msql/php_msql.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

/* $Id$ */

#ifndef _PHP_MSQL_H
#define _PHP_MSQL_H
#ifndef PHP_MSQL_H
#define PHP_MSQL_H

#if HAVE_MSQL

Expand Down Expand Up @@ -91,4 +91,4 @@ typedef struct {

#define phpext_msql_ptr msql_module_ptr

#endif /* _PHP_MSQL_H */
#endif /* PHP_MSQL_H */
6 changes: 3 additions & 3 deletions ext/mssql/php_mssql.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

/* $Id$ */

#ifndef _PHP_MSSQL_H
#define _PHP_MSSQL_H
#ifndef PHP_MSSQL_H
#define PHP_MSSQL_H


#if HAVE_MSSQL
Expand Down Expand Up @@ -154,4 +154,4 @@ extern PHP_MSSQL_API php_mssql_globals mssql_globals;

#define phpext_mssql_ptr mssql_module_ptr

#endif /* _PHP_MSSQL_H */
#endif /* PHP_MSSQL_H */
Loading

0 comments on commit 16017f6

Please sign in to comment.