pajoye Sat Aug 23 20:42:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard crypt_freesec.c crypt_freesec.h Log: - MFB: fix build (common inline definition will be done later) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-src/ext/standard/crypt_freesec.c diff -u php-src/ext/standard/crypt_freesec.c:1.1.2.4 php-src/ext/standard/crypt_freesec.c:1.1.2.5 --- php-src/ext/standard/crypt_freesec.c:1.1.2.4 Sat Aug 23 13:57:19 2008 +++ php-src/ext/standard/crypt_freesec.c Sat Aug 23 20:42:18 2008 @@ -1,5 +1,5 @@ /* - $Id: crypt_freesec.c,v 1.1.2.4 2008/08/23 13:57:19 lbarnaud Exp $ + $Id: crypt_freesec.c,v 1.1.2.5 2008/08/23 20:42:18 pajoye 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.4 2008/08/23 13:57:19 lbarnaud Exp $ + * $Id: crypt_freesec.c,v 1.1.2.5 2008/08/23 20:42:18 pajoye Exp $ * * This is an original implementation of the DES and the crypt(3) interfaces * by David Burren <davidb at werj.com.au>. @@ -69,6 +69,20 @@ #include <stdio.h> #endif + +#if defined(__GNUC__) +# ifdef inline +# undef inline +# endif +# define inline inline __attribute__((always_inline)) +#elif defined(_MSC_VER) +# define inline __forceinline +#else +# ifndef inline +# define inline +# endif +#endif + #include "crypt_freesec.h" #define _PASSWORD_EFMT1 '_' http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-src/ext/standard/crypt_freesec.h diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.4 php-src/ext/standard/crypt_freesec.h:1.1.2.5 --- php-src/ext/standard/crypt_freesec.h:1.1.2.4 Sat Aug 23 13:57:19 2008 +++ php-src/ext/standard/crypt_freesec.h Sat Aug 23 20:42:18 2008 @@ -1,4 +1,4 @@ -/* $Id: crypt_freesec.h,v 1.1.2.4 2008/08/23 13:57:19 lbarnaud Exp $ */ +/* $Id: crypt_freesec.h,v 1.1.2.5 2008/08/23 20:42:18 pajoye Exp $ */ #ifndef _CRYPT_FREESEC_H #define _CRYPT_FREESEC_H @@ -6,8 +6,14 @@ #if PHP_WIN32 # include "win32/php_stdint.h" -#elif HAVE_STDINT_H +#else +# include "php_config.h" +# if HAVE_STDINT_H # include <stdint.h> +# endif +# ifndef HAVE_U_INT32_T + typedef uint32_t u_int32_t; +# endif #endif #if !PHP_WIN32 # ifndef HAVE_U_INT32_T
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php