CVS update: php4
| From: | zeev | Date: | Fri, 04 Jun 1999 10:45:54 +0000 |
| Subject: | CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1278@lists.php.net to get a copy of this message | ||
Date: Friday June 4, 1999 @ 6:45
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv5906
Modified Files:
config.w32.h php.h php_globals.h php_ini.c php_ini.h
Added Files:
php4ext.dsw
Log Message:
* Add a new workspace for dynamic PHP extensions.
* Add a few functions to PHP's API.
* Get the MySQL extension up-to-date and thread safe.
* Add a project for building the MySQL extension under Win32.
Index: php4/config.w32.h
diff -u php4/config.w32.h:1.3 php4/config.w32.h:1.4
--- php4/config.w32.h:1.3 Thu May 20 08:06:43 1999
+++ php4/config.w32.h Fri Jun 4 06:45:53 1999
@@ -37,7 +37,6 @@
---------------------------------------------------------------*/
#if !defined(COMPILE_DL)
#define HAVE_SNMP 0
-#define HAVE_MYSQL 0
# define HAVE_ERRMSG_H 0 /*needed for mysql 3.21.17 and up*/
#define HAVE_LDAP 0
#define DBASE 0
Index: php4/php.h
diff -u php4/php.h:1.16 php4/php.h:1.17
--- php4/php.h:1.16 Wed May 26 20:45:31 1999
+++ php4/php.h Fri Jun 4 06:45:53 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.16 1999/05/27 00:45:31 zeev Exp $ */
+/* $Id: php.h,v 1.17 1999/06/04 10:45:53 zeev Exp $ */
#ifndef _PHP_H
#define _PHP_H
@@ -190,7 +190,7 @@
#endif
#if HAVE_PWD_H
-# if MSVC5
+# if WIN32||WINNT
#include "win32/pwd.h"
#include "win32/param.h"
# else
@@ -257,8 +257,6 @@
#if !(WIN32||WINNT)
extern char **environ;
#endif
-
-extern PHPAPI int le_index_ptr; /* list entry type for index pointers */
extern void phperror(char *error);
extern PHPAPI void php3_error(int type, const char *format,...);
Index: php4/php_globals.h
diff -u php4/php_globals.h:1.13 php4/php_globals.h:1.14
--- php4/php_globals.h:1.13 Tue May 11 12:52:57 1999
+++ php4/php_globals.h Fri Jun 4 06:45:53 1999
@@ -12,7 +12,7 @@
# define PLS_CC , PLS_C
# define PG(v) (core_globals->v)
# define PLS_FETCH() php_core_globals *core_globals = ts_resource(core_globals_id)
-PHPAPI extern int core_globals_id;
+extern PHPAPI int core_globals_id;
#else
# define PLS_D
# define PLS_DC
Index: php4/php_ini.c
diff -u php4/php_ini.c:1.21 php4/php_ini.c:1.22
--- php4/php_ini.c:1.21 Sun May 30 08:00:06 1999
+++ php4/php_ini.c Fri Jun 4 06:45:53 1999
@@ -351,7 +351,7 @@
/* Standard message handlers */
-PHP_INI_MH(OnUpdateInt)
+PHPAPI PHP_INI_MH(OnUpdateInt)
{
long *p;
#ifndef ZTS
@@ -369,7 +369,7 @@
}
-PHP_INI_MH(OnUpdateReal)
+PHPAPI PHP_INI_MH(OnUpdateReal)
{
double *p;
#ifndef ZTS
@@ -387,7 +387,7 @@
}
-PHP_INI_MH(OnUpdateString)
+PHPAPI PHP_INI_MH(OnUpdateString)
{
char **p;
#ifndef ZTS
@@ -405,7 +405,7 @@
}
-PHP_INI_MH(OnUpdateStringUnempty)
+PHPAPI PHP_INI_MH(OnUpdateStringUnempty)
{
char **p;
#ifndef ZTS
Index: php4/php_ini.h
diff -u php4/php_ini.h:1.9 php4/php_ini.h:1.10
--- php4/php_ini.h:1.9 Sun May 9 09:57:09 1999
+++ php4/php_ini.h Fri Jun 4 06:45:53 1999
@@ -111,10 +111,10 @@
/* Standard message handlers */
-PHP_INI_MH(OnUpdateInt);
-PHP_INI_MH(OnUpdateReal);
-PHP_INI_MH(OnUpdateString);
-PHP_INI_MH(OnUpdateStringUnempty);
+PHPAPI PHP_INI_MH(OnUpdateInt);
+PHPAPI PHP_INI_MH(OnUpdateReal);
+PHPAPI PHP_INI_MH(OnUpdateString);
+PHPAPI PHP_INI_MH(OnUpdateStringUnempty);
#define PHP_INI_DISPLAY_ORIG 1