Skip to content

Commit 5b983c9

Browse files
author
Sascha Schumann
committed
Clean up php3.*\.h files. The files itself are renamed, and references in all
.*\.[ch] files were changed. There is a slight chance that my script missed a few changes, please correct them manually.
1 parent 83ce7c1 commit 5b983c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+263
-261
lines changed

‎ext/aspell/aspell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#if HAVE_ASPELL
3030

31-
#include "php3_aspell.h"
31+
#include "php_aspell.h"
3232
#if APACHE
3333
# ifndef DEBUG
3434
# undef palloc

‎ext/aspell/php3_aspell.h renamed to ‎ext/aspell/php_aspell.h

File renamed without changes.

‎ext/bcmath/bcmath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#if WITH_BCMATH
2222

2323
#include "number.h"
24-
#include "php3_bcmath.h"
24+
#include "php_bcmath.h"
2525

2626
function_entry bcmath_functions[] = {
2727
PHP_FE(bcadd, NULL)

‎ext/bcmath/php3_bcmath.h renamed to ‎ext/bcmath/php_bcmath.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
/* $Id$ */
3232

33-
#ifndef _PHP3_BCMATH_H
34-
#define _PHP3_BCMATH_H
33+
#ifndef _PHP_BCMATH_H
34+
#define _PHP_BCMATH_H
3535

3636
#if COMPILE_DL
3737
#undef WITH_BCMATH
@@ -61,4 +61,4 @@ PHP_FUNCTION(bcscale);
6161

6262
#endif
6363

64-
#endif /* _PHP3_BCMATH_H */
64+
#endif /* _PHP_BCMATH_H */

‎ext/cpdf/cpdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#endif
5555

5656
#if HAVE_CPDFLIB
57-
#include "php3_cpdf.h"
57+
#include "php_cpdf.h"
5858

5959
#ifdef THREAD_SAFE
6060
DWORD CPDFlibTls;

‎ext/cpdf/php3_cpdf.h renamed to ‎ext/cpdf/php_cpdf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
*/
2929
/* $Id$ */
3030

31-
#ifndef _PHP3_CPDF_H
32-
#define _PHP3_CPDF_H
31+
#ifndef _PHP_CPDF_H
32+
#define _PHP_CPDF_H
3333

3434
#if HAVE_CPDFLIB
3535

‎ext/dav/dav.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# endif
2828
#endif
2929
#include "php.h"
30-
#include "php3_dav.h"
30+
#include "php_dav.h"
3131

3232
#if defined(THREAD_SAFE) && !PHP_31
3333
# undef THREAD_SAFE

‎ext/dav/php3_dav.h renamed to ‎ext/dav/php_dav.h

File renamed without changes.

‎ext/db/db.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ datum flatfile_nextkey(FILE *dbf);
148148

149149
#endif
150150

151-
#include "php3_db.h"
152-
#include "ext/standard/php3_string.h"
151+
#include "php_db.h"
152+
#include "ext/standard/php_string.h"
153153

154154
#if THREAD_SAFE
155155
DWORD DbmTls;

‎ext/db/php3_db.h renamed to ‎ext/db/php_db.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
/* $Id$ */
3232

3333

34-
#ifndef _PHP3_DB_H
35-
#define _PHP3_DB_H
34+
#ifndef _PHP_DB_H
35+
#define _PHP_DB_H
3636

3737

3838
#ifndef DLEXPORT
@@ -92,4 +92,4 @@ PHP_FUNCTION(dbmnextkey);
9292
#undef phpext_db_ptr
9393
#define phpext_db_ptr NULL
9494

95-
#endif /* _PHP3_DB_H */
95+
#endif /* _PHP_DB_H */

‎ext/dba/dba.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333

3434
#if HAVE_DBA
3535

36-
#include "php3_dba.h"
37-
38-
#include "php3_gdbm.h"
39-
#include "php3_ndbm.h"
40-
#include "php3_dbm.h"
41-
#include "php3_cdb.h"
42-
#include "php3_db2.h"
43-
#include "php3_db3.h"
36+
#include "php_dba.h"
37+
38+
#include "php_gdbm.h"
39+
#include "php_ndbm.h"
40+
#include "php_dbm.h"
41+
#include "php_cdb.h"
42+
#include "php_db2.h"
43+
#include "php_db3.h"
4444

4545
function_entry dba_functions[] = {
4646
PHP_FE(dba_open, NULL)

‎ext/dba/dba_cdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_CDB
35-
#include "php3_cdb.h"
35+
#include "php_cdb.h"
3636

3737
#include <sys/types.h>
3838
#include <unistd.h>

‎ext/dba/dba_db2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_DB2
35-
#include "php3_db2.h"
35+
#include "php_db2.h"
3636
#include <sys/stat.h>
3737

3838
#include <string.h>

‎ext/dba/dba_db3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_DB3
35-
#include "php3_db3.h"
35+
#include "php_db3.h"
3636
#include <sys/stat.h>
3737

3838
#include <string.h>

‎ext/dba/dba_dbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_DBM
35-
#include "php3_dbm.h"
35+
#include "php_dbm.h"
3636

3737
#include <dbm.h>
3838

‎ext/dba/dba_gdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_GDBM
35-
#include "php3_gdbm.h"
35+
#include "php_gdbm.h"
3636

3737
#include <gdbm.h>
3838

‎ext/dba/dba_ndbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "php.h"
3333

3434
#if DBA_NDBM
35-
#include "php3_ndbm.h"
35+
#include "php_ndbm.h"
3636

3737
#include <fcntl.h>
3838

‎ext/dba/php3_cdb.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php3_db2.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php3_db3.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php3_dbm.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php3_gdbm.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php3_ndbm.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/dba/php_cdb.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_CDB_H
2+
#define _PHP_CDB_H
3+
4+
#if DBA_CDB
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(cdb);
9+
10+
#endif
11+
12+
#endif

‎ext/dba/php_db2.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_DB2_H
2+
#define _PHP_DB2_H
3+
4+
#if DBA_DB2
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(db2);
9+
10+
#endif
11+
12+
#endif

‎ext/dba/php_db3.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_DB3_H
2+
#define _PHP_DB3_H
3+
4+
#if DBA_DB3
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(db3);
9+
10+
#endif
11+
12+
#endif

‎ext/dba/php3_dba.h renamed to ‎ext/dba/php_dba.h

File renamed without changes.

‎ext/dba/php_dbm.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_DBM_H
2+
#define _PHP_DBM_H
3+
4+
#if DBA_DBM
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(dbm);
9+
10+
#endif
11+
12+
#endif

‎ext/dba/php_gdbm.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_GDBM_H
2+
#define _PHP_GDBM_H
3+
4+
#if DBA_GDBM
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(gdbm);
9+
10+
#endif
11+
12+
#endif

‎ext/dba/php_ndbm.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _PHP_NDBM_H
2+
#define _PHP_NDBM_H
3+
4+
#if DBA_NDBM
5+
6+
#include "php_dba.h"
7+
8+
DBA_FUNCS(ndbm);
9+
10+
#endif
11+
12+
#endif

‎ext/domxml/domxml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
#include "php.h"
23-
#include "php3_domxml.h"
23+
#include "php_domxml.h"
2424

2525
#if HAVE_DOMXML
2626

‎ext/domxml/php3_domxml.h renamed to ‎ext/domxml/php_domxml.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
/* $Id$ */
3333

34-
#ifndef _PHP3_DOMXML_H
35-
#define _PHP3_DOMXML_H
34+
#ifndef _PHP_DOMXML_H
35+
#define _PHP_DOMXML_H
3636

3737
#if HAVE_DOMXML
3838
#include <gnome-xml/parser.h>

‎ext/ereg/ereg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <stdio.h>
2323
#include "php.h"
24-
#include "php3_string.h"
24+
#include "php_string.h"
2525
#include "reg.h"
2626

2727
unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };

‎ext/fdf/fdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "php.h"
3131
#include "ext/standard/head.h"
3232
#include <math.h>
33-
#include "php3_fdf.h"
33+
#include "php_fdf.h"
3434

3535
#if HAVE_SYS_WAIT_H
3636
# include <sys/wait.h>

‎ext/fdf/php3_fdf.h renamed to ‎ext/fdf/php_fdf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
*/
2929
/* $Id$ */
3030

31-
#ifndef _PHP3_FDF_H
32-
#define _PHP3_FDF_H
31+
#ifndef _PHP_FDF_H
32+
#define _PHP_FDF_H
3333

3434
#if HAVE_FDFLIB
3535
#if WIN32|WINNT
@@ -62,4 +62,4 @@ PHP_FUNCTION(fdf_add_template);
6262
#else
6363
#define phpext_fdf_ptr NULL
6464
#endif
65-
#endif /* _PHP3_FDF_H */
65+
#endif /* _PHP_FDF_H */

‎ext/gd/gd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "ext/standard/head.h"
3030
#include <math.h>
3131
#include "SAPI.h"
32-
#include "php3_gd.h"
32+
#include "php_gd.h"
3333

3434
#if HAVE_SYS_WAIT_H
3535
# include <sys/wait.h>

0 commit comments

Comments
 (0)