MFH: Fix build on solaris

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 125e7266a3ed0f71e1b93ae29fd7112ac8e99134..e42d3906178f0b99599eb945a697efc17c694563 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -463,6 +463,27 @@ if test "$ac_cv_type_mbstate_t" = "yes"; then
   AC_DEFINE([HAVE_MBSTATE_T], 1, [Define if your system has mbstate_t in wchar.h])
 fi
 
+dnl
+dnl Check for u_int32_t
+dnl
+AC_CACHE_CHECK([for u_int32_t], [ac_cv_type_u_int32_t],[
+AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+],[
+int __tmp__() { u_int32_t a; }
+],[
+  ac_cv_type_u_int32_t=yes
+],[
+  ac_cv_type_u_int32_t=no
+])])
+if test "$ac_cv_type_u_int32_t" = "yes"; then
+  AC_DEFINE([HAVE_U_INT32_T], 1, [Define if your system has u_int32_t in sys/types.h])
+fi
+
+AC_C_INLINE
+
 dnl
 dnl Setup extension sources
 dnl

diff --git a/ext/standard/crypt_freesec.c b/ext/standard/crypt_freesec.c
index c30616eed7204f6ad8f6b95978b26dd024ab9622..b9c852016749ef7788da7732e10f908ef6188357 100644 (file)
--- a/ext/standard/crypt_freesec.c
+++ b/ext/standard/crypt_freesec.c
@@ -184,7 +184,7 @@ static u_int32_t fp_maskl[8][256], fp_maskr[8][256];
 static u_int32_t key_perm_maskl[8][128], key_perm_maskr[8][128];
 static u_int32_t comp_maskl[8][128], comp_maskr[8][128];
 
-__inline int
+static inline int
 ascii_to_bin(char ch)
 {
        if (ch > 'z')

diff --git a/ext/standard/crypt_freesec.h b/ext/standard/crypt_freesec.h
index f64ad2fcf04e36938ad12e65b269aff470da4683..0cbecacbdcab8099a57ba039192821c92aee3a5c 100644 (file)
--- a/ext/standard/crypt_freesec.h
+++ b/ext/standard/crypt_freesec.h
@@ -2,11 +2,18 @@
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
+#include "php_config.h"
+
 #if PHP_WIN32
 # include "win32/php_stdint.h"
 #elif HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#if !PHP_WIN32
+# ifndef HAVE_U_INT32_T
+   typedef uint32_t u_int32_t;
+# endif
+#endif
 
 #define MD5_HASH_MAX_LEN 120