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.

20 files changed, 86 insertions, 86 deletions

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index dd5eeb9cd2..468d29d0ce 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -33,14 +33,14 @@
 
 #if HAVE_DBA
 
-#include "php3_dba.h"
-
-#include "php3_gdbm.h"
-#include "php3_ndbm.h"
-#include "php3_dbm.h"
-#include "php3_cdb.h"
-#include "php3_db2.h"
-#include "php3_db3.h"
+#include "php_dba.h"
+
+#include "php_gdbm.h"
+#include "php_ndbm.h"
+#include "php_dbm.h"
+#include "php_cdb.h"
+#include "php_db2.h"
+#include "php_db3.h"
 
 function_entry dba_functions[] = {
 	PHP_FE(dba_open, NULL)
diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 55683590c5..fa38de931b 100644
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_CDB
-#include "php3_cdb.h"
+#include "php_cdb.h"
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 77f010a7f2..b662a644aa 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB2
-#include "php3_db2.h"
+#include "php_db2.h"
 #include <sys/stat.h>
 
 #include <string.h>
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index dece9634a4..38a2065537 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB3
-#include "php3_db3.h"
+#include "php_db3.h"
 #include <sys/stat.h>
 
 #include <string.h>
diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index b8b4ea95f2..0fab79f002 100644
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DBM
-#include "php3_dbm.h"
+#include "php_dbm.h"
 
 #include <dbm.h>
 
diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index 6fde65ec73..fd345997d9 100644
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_GDBM
-#include "php3_gdbm.h"
+#include "php_gdbm.h"
 
 #include <gdbm.h>
 
diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c
index 3c10868aab..974794701f 100644
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_NDBM
-#include "php3_ndbm.h"
+#include "php_ndbm.h"
 
 #include <fcntl.h>
 
diff --git a/ext/dba/php3_cdb.h b/ext/dba/php3_cdb.h
deleted file mode 100644
index 162fa8bdb2..0000000000
--- a/ext/dba/php3_cdb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_CDB_H
-#define _PHP3_CDB_H
-
-#if DBA_CDB
-
-#include "php3_dba.h"
-
-DBA_FUNCS(cdb);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_db2.h b/ext/dba/php3_db2.h
deleted file mode 100644
index 0f8c458db9..0000000000
--- a/ext/dba/php3_db2.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB2_H
-#define _PHP3_DB2_H
-
-#if DBA_DB2
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db2);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_db3.h b/ext/dba/php3_db3.h
deleted file mode 100644
index 4c00dfd448..0000000000
--- a/ext/dba/php3_db3.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB3_H
-#define _PHP3_DB3_H
-
-#if DBA_DB3
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db3);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_dbm.h b/ext/dba/php3_dbm.h
deleted file mode 100644
index 5007c84b3e..0000000000
--- a/ext/dba/php3_dbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DBM_H
-#define _PHP3_DBM_H
-
-#if DBA_DBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(dbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_gdbm.h b/ext/dba/php3_gdbm.h
deleted file mode 100644
index 9a18b531d4..0000000000
--- a/ext/dba/php3_gdbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_GDBM_H
-#define _PHP3_GDBM_H
-
-#if DBA_GDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(gdbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_ndbm.h b/ext/dba/php3_ndbm.h
deleted file mode 100644
index 398b8e39a1..0000000000
--- a/ext/dba/php3_ndbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_NDBM_H
-#define _PHP3_NDBM_H
-
-#if DBA_NDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(ndbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h
new file mode 100644
index 0000000000..5574038991
--- /dev/null
+++ b/ext/dba/php_cdb.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_CDB_H
+#define _PHP_CDB_H
+
+#if DBA_CDB
+
+#include "php_dba.h"
+
+DBA_FUNCS(cdb);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h
new file mode 100644
index 0000000000..d88582f1eb
--- /dev/null
+++ b/ext/dba/php_db2.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB2_H
+#define _PHP_DB2_H
+
+#if DBA_DB2
+
+#include "php_dba.h"
+
+DBA_FUNCS(db2);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h
new file mode 100644
index 0000000000..126afe98a6
--- /dev/null
+++ b/ext/dba/php_db3.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB3_H
+#define _PHP_DB3_H
+
+#if DBA_DB3
+
+#include "php_dba.h"
+
+DBA_FUNCS(db3);
+
+#endif
+
+#endif
diff --git a/ext/dba/php3_dba.h b/ext/dba/php_dba.h
index 4a1470c503..4a1470c503 100644
--- a/ext/dba/php3_dba.h
+++ b/ext/dba/php_dba.h
diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h
new file mode 100644
index 0000000000..e99b8cc3a0
--- /dev/null
+++ b/ext/dba/php_dbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DBM_H
+#define _PHP_DBM_H
+
+#if DBA_DBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(dbm);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h
new file mode 100644
index 0000000000..0ee6e612e7
--- /dev/null
+++ b/ext/dba/php_gdbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_GDBM_H
+#define _PHP_GDBM_H
+
+#if DBA_GDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(gdbm);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h
new file mode 100644
index 0000000000..798916b6c7
--- /dev/null
+++ b/ext/dba/php_ndbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_NDBM_H
+#define _PHP_NDBM_H
+
+#if DBA_NDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(ndbm);
+
+#endif
+
+#endif