hyanantha Wed Jul 27 06:26:27 2005 EDT
Removed files: (Branch: PHP_4_4)
/php-src/main config.nw.h
Modified files:
/php-src/main php.h php_syslog.h
Log:
main/php_syslog.h
NetWare can make use of Autoconf based build.
main/php.h
Removed redundant NEW_LIBC checks.
PHP_UNAME and PHP_OS has been hardcoded for NetWare inside configure.in
Removed the config.nw.h
--Kamesh
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.178.2.14.2.1&r2=1.178.2.14.2.2&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.178.2.14.2.1 php-src/main/php.h:1.178.2.14.2.2
--- php-src/main/php.h:1.178.2.14.2.1 Mon Jul 25 10:07:16 2005
+++ php-src/main/php.h Wed Jul 27 06:26:25 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.178.2.14.2.1 2005/07/25 14:07:16 hyanantha Exp $ */
+/* $Id: php.h,v 1.178.2.14.2.2 2005/07/27 10:26:25 hyanantha Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -65,16 +65,6 @@
#endif
#endif
-#ifdef NETWARE
-/* For php_get_uname() function */
-#define PHP_UNAME "NetWare"
-/*
- * This is obtained using uname(2) on Unix and assigned in the case of Windows;
- * we'll do it this way at least for now.
- */
-#define PHP_OS PHP_UNAME
-#endif
-
#include "php_regex.h"
#if HAVE_ASSERT_H
@@ -249,21 +239,10 @@
/* global variables */
-#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
+#ifndef PHP_WIN32
extern char **environ;
#define php_sleep sleep
#endif
-#endif
#ifdef PHP_PWRITE_64
ssize_t pwrite(int, void *, size_t, off64_t);
http://cvs.php.net/diff.php/php-src/main/php_syslog.h?r1=1.6.2.1&r2=1.6.2.1.2.1&ty=u
Index: php-src/main/php_syslog.h
diff -u php-src/main/php_syslog.h:1.6.2.1 php-src/main/php_syslog.h:1.6.2.1.2.1
--- php-src/main/php_syslog.h:1.6.2.1 Sun Jan 9 16:05:31 2005
+++ php-src/main/php_syslog.h Wed Jul 27 06:26:25 2005
@@ -3,11 +3,6 @@
#ifdef PHP_WIN32
#include "win32/syslog.h"
-#elif defined(NETWARE)
-# include "config.nw.h"
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
#else
#include <php_config.h>
#ifdef HAVE_SYSLOG_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
