[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard crypt_freesec.h

2008-08-25 Thread Jani Taskinen
janiMon Aug 25 14:10:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   crypt_freesec.h 
  Log:
  MFH: fix build on win32
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.7r2=1.1.2.8diff_format=u
Index: php-src/ext/standard/crypt_freesec.h
diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.7 
php-src/ext/standard/crypt_freesec.h:1.1.2.8
--- php-src/ext/standard/crypt_freesec.h:1.1.2.7Mon Aug 25 13:42:55 2008
+++ php-src/ext/standard/crypt_freesec.hMon Aug 25 14:10:38 2008
@@ -1,13 +1,12 @@
-/* $Id: crypt_freesec.h,v 1.1.2.7 2008/08/25 13:42:55 jani Exp $ */
+/* $Id: crypt_freesec.h,v 1.1.2.8 2008/08/25 14:10:38 jani Exp $ */
 
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
-#include php_config.h
-
 #if PHP_WIN32
 # include win32/php_stdint.h
 #else
+# include php_config.h
 # if HAVE_INTTYPES_H
 #  include inttypes.h
 # elif HAVE_STDINT_H



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard crypt_freesec.h

2008-08-25 Thread Pierre-Alain Joye
pajoye  Mon Aug 25 14:37:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   crypt_freesec.h 
  Log:
  - and the last part of the fix, inline on win
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/ext/standard/crypt_freesec.h
diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.8 
php-src/ext/standard/crypt_freesec.h:1.1.2.9
--- php-src/ext/standard/crypt_freesec.h:1.1.2.8Mon Aug 25 14:10:38 2008
+++ php-src/ext/standard/crypt_freesec.hMon Aug 25 14:37:07 2008
@@ -1,10 +1,13 @@
-/* $Id: crypt_freesec.h,v 1.1.2.8 2008/08/25 14:10:38 jani Exp $ */
+/* $Id: crypt_freesec.h,v 1.1.2.9 2008/08/25 14:37:07 pajoye Exp $ */
 
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
 #if PHP_WIN32
 # include win32/php_stdint.h
+# ifndef inline
+# define inline __inline
+# endif
 #else
 # include php_config.h
 # if HAVE_INTTYPES_H



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard crypt_freesec.h

2008-08-23 Thread Pierre-Alain Joye
pajoye  Sat Aug 23 21:08:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   crypt_freesec.h 
  Log:
  - MFH: fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/standard/crypt_freesec.h
diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.5 
php-src/ext/standard/crypt_freesec.h:1.1.2.6
--- php-src/ext/standard/crypt_freesec.h:1.1.2.5Sat Aug 23 20:42:18 2008
+++ php-src/ext/standard/crypt_freesec.hSat Aug 23 21:08:09 2008
@@ -1,8 +1,7 @@
-/* $Id: crypt_freesec.h,v 1.1.2.5 2008/08/23 20:42:18 pajoye Exp $ */
+/* $Id: crypt_freesec.h,v 1.1.2.6 2008/08/23 21:08:09 pajoye Exp $ */
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
-#include php_config.h
 
 #if PHP_WIN32
 # include win32/php_stdint.h
@@ -15,11 +14,6 @@
typedef uint32_t u_int32_t;
 # endif
 #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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard crypt_freesec.h

2008-08-08 Thread Hannes Magnusson
bjori   Fri Aug  8 08:20:27 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   crypt_freesec.h 
  Log:
  MFH: Fix build on FreeBSD4.11 (bug#45757)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_freesec.h?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/crypt_freesec.h
diff -u php-src/ext/standard/crypt_freesec.h:1.1.2.2 
php-src/ext/standard/crypt_freesec.h:1.1.2.3
--- php-src/ext/standard/crypt_freesec.h:1.1.2.2Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/crypt_freesec.hFri Aug  8 08:20:27 2008
@@ -1,10 +1,10 @@
-/* $Id: crypt_freesec.h,v 1.1.2.2 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: crypt_freesec.h,v 1.1.2.3 2008/08/08 08:20:27 bjori Exp $ */
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
 #if PHP_WIN32
 # include win32/php_stdint.h
-#else
+#elif HAVE_STDINT_H
 # include stdint.h
 #endif
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php