lbarnaud Sat Aug 23 13:57:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard config.m4 crypt_freesec.c crypt_freesec.h
Log:
MFH: Fix build on solaris
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.80.2.3.2.3.2.3&r2=1.80.2.3.2.3.2.4&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80.2.3.2.3.2.3
php-src/ext/standard/config.m4:1.80.2.3.2.3.2.4
--- php-src/ext/standard/config.m4:1.80.2.3.2.3.2.3 Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/config.m4 Sat Aug 23 13:57:19 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.80.2.3.2.3.2.3 2008/07/28 11:50:34 pajoye Exp $ -*-
autoconf -*-
+dnl $Id: config.m4,v 1.80.2.3.2.3.2.4 2008/08/23 13:57:19 lbarnaud Exp $ -*-
autoconf -*-
divert(3)dnl
@@ -464,6 +464,27 @@
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
PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c
crc32.c crypt.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/crypt_freesec.c
diff -u php-src/ext/standard/crypt_freesec.c:1.1.2.3
php-src/ext/standard/crypt_freesec.c:1.1.2.4
--- php-src/ext/standard/crypt_freesec.c:1.1.2.3 Mon Jul 28 16:33:17 2008
+++ php-src/ext/standard/crypt_freesec.c Sat Aug 23 13:57:19 2008
@@ -1,5 +1,5 @@
/*
- $Id: crypt_freesec.c,v 1.1.2.3 2008/07/28 16:33:17 pajoye Exp $
+ $Id: crypt_freesec.c,v 1.1.2.4 2008/08/23 13:57:19 lbarnaud Exp $
*/
/*
* This version is derived from the original implementation of FreeSec
@@ -40,7 +40,7 @@
* SUCH DAMAGE.
*
* $Owl: Owl/packages/glibc/crypt_freesec.c,v 1.4 2005/11/16 13:08:32
solar Exp $
- * $Id: crypt_freesec.c,v 1.1.2.3 2008/07/28 16:33:17 pajoye Exp $
+ * $Id: crypt_freesec.c,v 1.1.2.4 2008/08/23 13:57:19 lbarnaud Exp $
*
* This is an original implementation of the DES and the crypt(3) interfaces
* by David Burren <davidb at werj.com.au>.
@@ -184,7 +184,7 @@
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')
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/crypt_freesec.h
diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.3
php-src/ext/standard/crypt_freesec.h:1.1.2.4
--- php-src/ext/standard/crypt_freesec.h:1.1.2.3 Fri Aug 8 08:20:27 2008
+++ php-src/ext/standard/crypt_freesec.h Sat Aug 23 13:57:19 2008
@@ -1,12 +1,19 @@
-/* $Id: crypt_freesec.h,v 1.1.2.3 2008/08/08 08:20:27 bjori Exp $ */
+/* $Id: crypt_freesec.h,v 1.1.2.4 2008/08/23 13:57:19 lbarnaud Exp $ */
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
