Was this some MFH or why didn't you commit to HEAD?
--Jani
On Wed, 14 Dec 2005, Wez Furlong wrote:
wez Wed Dec 14 02:01:13 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main win95nt.h
/php-src/win32/build config.w32 config.w32.h.in
Log:
Fixes for building with vs.net 2005.
http://cvs.php.net/viewcvs.cgi/php-src/main/win95nt.h?r1=1.20&r2=1.20.2.1&diff_format=u
Index: php-src/main/win95nt.h
diff -u php-src/main/win95nt.h:1.20 php-src/main/win95nt.h:1.20.2.1
--- php-src/main/win95nt.h:1.20 Wed Aug 3 14:08:40 2005
+++ php-src/main/win95nt.h Wed Dec 14 02:01:13 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: win95nt.h,v 1.20 2005/08/03 14:08:40 sniper Exp $ */
+/* $Id: win95nt.h,v 1.20.2.1 2005/12/14 02:01:13 wez Exp $ */
/* Defines and types for Windows 95/NT */
#define HAVE_DECLARED_TIMEZONE
@@ -46,7 +46,9 @@
#define rmdir(a) _rmdir(a)
#define getpid _getpid
#define php_sleep(t) Sleep(t*1000)
-#define getcwd(a, b) _getcwd(a, b)
+#ifndef getcwd
+# define getcwd(a, b) _getcwd(a, b)
+#endif
#define off_t _off_t
typedef unsigned int uint;
typedef unsigned long ulong;
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.40.2.5&r2=1.40.2.6&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.5
php-src/win32/build/config.w32:1.40.2.6
--- php-src/win32/build/config.w32:1.40.2.5 Thu Dec 1 11:11:46 2005
+++ php-src/win32/build/config.w32 Wed Dec 14 02:01:13 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.5 2005/12/01 11:11:46 rrichards Exp $
+// $Id: config.w32,v 1.40.2.6 2005/12/14 02:01:13 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -97,8 +97,9 @@
if (VCVERS >= 14) {
// fun stuff: MS deprecated ANSI stdio and similar functions
- // disable annoying warnings
- ADD_FLAG('CFLAGS', ' /wd4996 ');
+ // disable annoying warnings. In addition, time_t defaults
+ // to 64-bit. Ask for 32-bit.
+ ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
if (PHP_DEBUG == "yes") {
// Set some debug/release specific options
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.1&r2=1.7.2.2&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.1
php-src/win32/build/config.w32.h.in:1.7.2.2
--- php-src/win32/build/config.w32.h.in:1.7.2.1 Wed Sep 21 08:41:16 2005
+++ php-src/win32/build/config.w32.h.in Wed Dec 14 02:01:13 2005
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.7.2.1 2005/09/21 08:41:16 derick Exp $
+ $Id: config.w32.h.in,v 1.7.2.2 2005/12/14 02:01:13 wez Exp $
*/
/* Default PHP / PEAR directories */
@@ -142,3 +142,10 @@
#undef HAVE_ATOF_ACCEPTS_NAN
#undef HAVE_ATOF_ACCEPTS_INF
#define HAVE_HUGE_VAL_NAN 1
+
+/* vs.net 2005 has a 64-bit time_t. This will likely break
+ * 3rdParty libs that were built with older compilers; switch
+ * back to 32-bit */
+#define _USE_32BIT_TIME_T 1
+#define HAVE_STDLIB_H 1
+
--
Give me your money at @ <http://pecl.php.net/wishlist.php/sniper>
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
