[PHP4BETA] CVS update: php4/functions
| From: | zeev | Date: | Wed, 21 Apr 1999 19:12:58 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/functions | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-251@lists.php.net to get a copy of this message | ||
Date: Wednesday April 21, 1999 @ 15:12
Author: zeev
Update of /repository/php4/functions
In directory php:/tmp/cvs-serv12883/functions
Modified Files:
msql.c mysql.c
Log Message:
We mustn't directly include config.h anymore, but instead rely on php.h's inclusion
Index: php4/functions/msql.c
diff -c php4/functions/msql.c:1.5 php4/functions/msql.c:1.6
*** php4/functions/msql.c:1.5 Wed Apr 21 13:11:01 1999
--- php4/functions/msql.c Wed Apr 21 15:12:57 1999
***************
*** 27,40 ****
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 1.5 1999/04/21 17:11:01 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
- #if !(WIN32|WINNT)
- #include "config.h"
- #endif
#include "php.h"
#if COMPILE_DL
#include "dl/phpdl.h"
--- 27,37 ----
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 1.6 1999/04/21 19:12:57 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
#include "php.h"
#if COMPILE_DL
#include "dl/phpdl.h"
Index: php4/functions/mysql.c
diff -c php4/functions/mysql.c:1.9 php4/functions/mysql.c:1.10
*** php4/functions/mysql.c:1.9 Wed Apr 21 15:10:18 1999
--- php4/functions/mysql.c Wed Apr 21 15:12:57 1999
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 1.9 1999/04/21 19:10:18 zeev Exp $ */
/* TODO:
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 1.10 1999/04/21 19:12:57 zeev Exp $ */
/* TODO:
***************
*** 43,52 ****
# endif
#endif
#if WIN32|WINNT
#include <winsock.h>
#else
- #include "config.h"
#include "build-defs.h"
#if HAVE_SYS_TYPES_H
--- 43,57 ----
# endif
#endif
+ #include "php.h"
+ #include "php_globals.h"
+ #include "ext/standard/php3_standard.h"
+ #include "php3_mysql.h"
+
+
#if WIN32|WINNT
#include <winsock.h>
#else
#include "build-defs.h"
#if HAVE_SYS_TYPES_H
***************
*** 56,65 ****
#include <netinet/in.h>
#endif
- #include "php.h"
- #include "php_globals.h"
- #include "ext/standard/php3_standard.h"
- #include "php3_mysql.h"
#include "php_ini.h"
--- 61,66 ----
--
PHP 4 Beta