[PHP-DEV] CVS update: php3/functions From: shane (php-dev <email protected>)
Date: 12/28/98

Date: Monday December 28, 1998 @ 14:01
Author: shane

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv7830/functions

Modified Files:
        microtime.c php3_unified_odbc.h
Log Message:
minor compile updates

Index: php3/functions/microtime.c
diff -c php3/functions/microtime.c:1.24 php3/functions/microtime.c:1.25
*** php3/functions/microtime.c:1.24 Sun Dec 27 10:47:12 1998
--- php3/functions/microtime.c Mon Dec 28 14:01:43 1998
***************
*** 27,43 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: microtime.c,v 1.24 1998/12/27 15:47:12 jimjag Exp $ */
  
  #include "php.h"
  #include <stdlib.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
! #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
  #endif
  #include <string.h>
--- 27,43 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: microtime.c,v 1.25 1998/12/28 19:01:43 shane Exp $ */
  
  #include "php.h"
  #include <stdlib.h>
! #if HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #if HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
! #if HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
  #endif
  #include <string.h>
***************
*** 52,58 ****
  
  #include <stdio.h>
  #if HAVE_GETTIMEOFDAY
! #if MSVC5
  #include "win32/time.h"
  #else
  #include <sys/time.h>
--- 52,58 ----
  
  #include <stdio.h>
  #if HAVE_GETTIMEOFDAY
! #if WIN32
  #include "win32/time.h"
  #else
  #include <sys/time.h>
Index: php3/functions/php3_unified_odbc.h
diff -c php3/functions/php3_unified_odbc.h:1.43 php3/functions/php3_unified_odbc.h:1.44
*** php3/functions/php3_unified_odbc.h:1.43 Mon Dec 21 10:48:33 1998
--- php3/functions/php3_unified_odbc.h Mon Dec 28 14:01:43 1998
***************
*** 29,35 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: php3_unified_odbc.h,v 1.43 1998/12/21 15:48:33 shane Exp $ */
  
  #ifndef _UNIFIED_ODBC_H
  #define _UNIFIED_ODBC_H
--- 29,35 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: php3_unified_odbc.h,v 1.44 1998/12/28 19:01:43 shane Exp $ */
  
  #ifndef _UNIFIED_ODBC_H
  #define _UNIFIED_ODBC_H
***************
*** 275,281 ****
  #define UODBC_GLOBAL_STRUCT UODBC_VAR(global_struct)
  #define UODBC_GLOBALS UODBC_VAR(globals)
  /* defines for variables, structs, etc */
! #define UODBC_MODULE_NAME "ODBC"
  #define UODBC_FUNCTIONS UODBC_VAR(functions)
  #define UODBC_CONNECTION UODBC_VAR(connection)
  #define UODBC_RESULT_VALUE UODBC_VAR(result_value)
--- 275,281 ----
  #define UODBC_GLOBAL_STRUCT UODBC_VAR(global_struct)
  #define UODBC_GLOBALS UODBC_VAR(globals)
  /* defines for variables, structs, etc */
! #define UODBC_MODULE_NAME "ODBC/" UODBC_NAME
  #define UODBC_FUNCTIONS UODBC_VAR(functions)
  #define UODBC_CONNECTION UODBC_VAR(connection)
  #define UODBC_RESULT_VALUE UODBC_VAR(result_value) 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>