diff options
Diffstat (limited to 'ext/db')
| -rw-r--r-- | ext/db/db.c | 8 | ||||
| -rw-r--r-- | ext/db/php3_db.h (renamed from ext/db/db.h) | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ext/db/db.c b/ext/db/db.c index d5400c819e..70ba058b03 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -158,14 +158,10 @@ int flatfile_findkey(FILE *dbf, datum key); int flatfile_delete(FILE *dbf, datum key); datum flatfile_firstkey(FILE *dbf); datum flatfile_nextkey(FILE *dbf); -#ifdef PHP_31 -#include "php3_db.h" -#include "ext/standard/php3_string.h" -#else -#endif #endif -#include "db.h" + +#include "php3_db.h" #include "ext/standard/php3_string.h" #if THREAD_SAFE diff --git a/ext/db/db.h b/ext/db/php3_db.h index acda632ac8..ded7774ffd 100644 --- a/ext/db/db.h +++ b/ext/db/php3_db.h @@ -41,7 +41,7 @@ extern php3_module_entry dbm_module_entry; -#define dbm_module_ptr &dbm_module_entry +#define phpext_db_ptr &dbm_module_entry @@ -58,8 +58,8 @@ typedef struct dbm_info { do not want flatfile compiled staticly */ #if defined(MSVC5) && !defined(COMPILE_DL) -#undef dbm_module_ptr -#define dbm_module_ptr NULL +#undef phpext_db_ptr +#define phpext_db_ptr NULL #endif dbm_info *_php3_finddbm(pval *id,HashTable *list); @@ -88,7 +88,7 @@ extern void php3_dbmdelete(INTERNAL_FUNCTION_PARAMETERS); extern void php3_dbmfirstkey(INTERNAL_FUNCTION_PARAMETERS); extern void php3_dbmnextkey(INTERNAL_FUNCTION_PARAMETERS); -#undef dbm_module_ptr -#define dbm_module_ptr NULL +#undef phpext_db_ptr +#define phpext_db_ptr NULL #endif /* _PHP3_DB_H */ |