hyanantha               Mon Sep  9 07:31:04 2002 EDT

  Modified files:              
    /php4/main  php.h 
  Log:
  NetWare related changes/modifications
  
  
Index: php4/main/php.h
diff -u php4/main/php.h:1.174 php4/main/php.h:1.175
--- php4/main/php.h:1.174       Mon Aug 12 16:12:31 2002
+++ php4/main/php.h     Mon Sep  9 07:31:03 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php.h,v 1.174 2002/08/12 20:12:31 helly Exp $ */
+/* $Id: php.h,v 1.175 2002/09/09 11:31:03 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -186,7 +186,11 @@
 #include "win32/pwd.h"
 #include "win32/param.h"
 #elif defined(NETWARE)
+#ifdef NEW_LIBC
 #include <sys/param.h>
+#else
+#include "NetWare/param.h"
+#endif
 #include "NetWare/pwd.h"
 # else
 #include <pwd.h>
@@ -234,8 +238,19 @@
 /* global variables */
 extern pval *data;
 #if !defined(PHP_WIN32)
+#ifdef NETWARE
+#ifdef NEW_LIBC
+/*#undef environ*/  /* For now, so that our 'environ' implementation is used */
+#define php_sleep sleep
+#else
+#define php_sleep   delay   /* sleep() and usleep() are not available */
+#define usleep      delay
+#endif
+extern char **environ;
+#else
 extern char **environ;
 #define php_sleep sleep
+#endif
 #endif
 
 #ifdef PHP_PWRITE_64



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to