tony2001 Tue Dec 12 12:06:00 2006 UTC
Modified files:
/php-src acinclude.m4
/php-src/ext/standard crypt.c
Log:
missing part of the fix for #39795
crypt.h defines struct crypt_data only if _REENTRANT is defined
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.353&r2=1.354&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.353 php-src/acinclude.m4:1.354
--- php-src/acinclude.m4:1.353 Tue Dec 12 10:15:58 2006
+++ php-src/acinclude.m4 Tue Dec 12 12:06:00 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.353 2006/12/12 10:15:58 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.354 2006/12/12 12:06:00 tony2001 Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2600,6 +2600,7 @@
AC_CACHE_CHECK([which data struct is used by crypt_r], php_cv_crypt_r_style,[
php_cv_crypt_r_style=none
AC_TRY_COMPILE([
+#define _REENTRANT 1
#include <crypt.h>
],[
CRYPTD buffer;
@@ -2609,6 +2610,7 @@
if test "$php_cv_crypt_r_style" = "none"; then
AC_TRY_COMPILE([
+#define _REENTRANT 1
#include <crypt.h>
],[
struct crypt_data buffer;
@@ -2619,6 +2621,7 @@
if test "$php_cv_crypt_r_style" = "none"; then
AC_TRY_COMPILE([
+#define _REENTRANT 1
#define _GNU_SOURCE
#include <crypt.h>
],[
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.67 php-src/ext/standard/crypt.c:1.68
--- php-src/ext/standard/crypt.c:1.67 Tue Dec 12 07:36:36 2006
+++ php-src/ext/standard/crypt.c Tue Dec 12 12:06:00 2006
@@ -17,7 +17,7 @@
| Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.67 2006/12/12 07:36:36 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.68 2006/12/12 12:06:00 tony2001 Exp $ */
#include <stdlib.h>
#include "php.h"
@@ -148,7 +148,7 @@
salt[2] = '\0';
#endif
}
-#ifdef HAVE_CRYPT_R
+#if defined(HAVE_CRYPT_R) && defined(_REENTRANT)
{
#if defined(CRYPT_R_STRUCT_CRYPT_DATA)
struct crypt_data buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
