martin Fri Nov 29 06:15:44 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd gdcache.h
/php4/ext/bcmath/libbcmath/src private.h
/php4/ext/standard mail.c
Log:
Portability fixes (MFH)
Index: php4/ext/gd/gdcache.h
diff -u php4/ext/gd/gdcache.h:1.2 php4/ext/gd/gdcache.h:1.2.14.1
--- php4/ext/gd/gdcache.h:1.2 Sun Jan 7 04:22:53 2001
+++ php4/ext/gd/gdcache.h Fri Nov 29 06:15:43 2002
@@ -1,5 +1,5 @@
/*
- * $Id: gdcache.h,v 1.2 2001/01/07 09:22:53 sniper Exp $
+ * $Id: gdcache.h,v 1.2.14.1 2002/11/29 11:15:43 martin Exp $
*
* Caches of pointers to user structs in which the least-recently-used
* element is replaced in the event of a cache miss after the cache has
@@ -40,7 +40,7 @@
/* header */
/*********************************************************/
-#if (!defined _OSD_POSIX) && HAVE_MALLOC_H
+#if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
#include <malloc.h>
#else
#include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
Index: php4/ext/bcmath/libbcmath/src/private.h
diff -u php4/ext/bcmath/libbcmath/src/private.h:1.1
php4/ext/bcmath/libbcmath/src/private.h:1.1.16.1
--- php4/ext/bcmath/libbcmath/src/private.h:1.1 Wed Nov 22 15:20:02 2000
+++ php4/ext/bcmath/libbcmath/src/private.h Fri Nov 29 06:15:43 2002
@@ -32,7 +32,7 @@
/* "Private" routines to bcmath. */
/* variables */
-bc_num _bc_Free_list;
+extern bc_num _bc_Free_list;
/* routines */
int _bc_do_compare (bc_num n1, bc_num n2, int use_sign, int ignore_last);
Index: php4/ext/standard/mail.c
diff -u php4/ext/standard/mail.c:1.66 php4/ext/standard/mail.c:1.66.2.1
--- php4/ext/standard/mail.c:1.66 Thu Oct 24 09:14:43 2002
+++ php4/ext/standard/mail.c Fri Nov 29 06:15:43 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.66 2002/10/24 13:14:43 sas Exp $ */
+/* $Id: mail.c,v 1.66.2.1 2002/11/29 11:15:43 martin Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -208,8 +208,10 @@
#else
#if defined(EX_TEMPFAIL)
if ((ret != EX_OK)&&(ret != EX_TEMPFAIL))
-#else
+#elif defined(EX_OK)
if (ret != EX_OK)
+#else
+ if (ret != 0)
#endif
#endif
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
