From: Pierre Joye Date: Sat, 23 Aug 2008 17:08:30 +0000 (+0000) Subject: - fix build X-Git-Tag: BEFORE_HEAD_NS_CHANGE~606 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=662e4b772567336d161d80e892d209cce51f1164;p=php - fix build --- diff --git a/ext/standard/crypt_freesec.c b/ext/standard/crypt_freesec.c index b9c8520167..b408a85f31 100644 --- a/ext/standard/crypt_freesec.c +++ b/ext/standard/crypt_freesec.c @@ -69,6 +69,20 @@ #include #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 '_' diff --git a/ext/standard/crypt_freesec.h b/ext/standard/crypt_freesec.h index 0cbecacbdc..f7f499470a 100644 --- a/ext/standard/crypt_freesec.h +++ b/ext/standard/crypt_freesec.h @@ -2,14 +2,14 @@ #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 -#endif -#if !PHP_WIN32 +#else +# include "php_config.h" +# if HAVE_STDINT_H +# include +# endif # ifndef HAVE_U_INT32_T typedef uint32_t u_int32_t; # endif