Portability fixes (MFH)

diff --git a/ext/bcmath/libbcmath/src/private.h b/ext/bcmath/libbcmath/src/private.h
index eaf4f444b2dccf5d7d05eb92cd5cf68a8e16d355..4458346626e9644858643fe74be3cc26dbcf46c1 100644 (file)
--- a/ext/bcmath/libbcmath/src/private.h
+++ b/ext/bcmath/libbcmath/src/private.h
@@ -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);

diff --git a/ext/gd/gdcache.h b/ext/gd/gdcache.h
index 06bf0ee6ce1f76d654ef68859c2ca5bdf50e51e9..87ab305aba7511fe13bd388fde3a250380a3b73b 100644 (file)
--- a/ext/gd/gdcache.h
+++ b/ext/gd/gdcache.h
@@ -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 */

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index e678bcc86e567bdfd5153b953a7a23f15aa0489b..24d125c3dfc67ec6dae31db05e39048f009efee9 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -208,8 +208,10 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 #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
                {