edink Tue Mar 22 17:07:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/exif exif.c exif.dsp
/php-src/ext/mbstring mbstring.dsp
Log:
Fix exif win32 build
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.36&r2=1.118.2.37&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.36 php-src/ext/exif/exif.c:1.118.2.37
--- php-src/ext/exif/exif.c:1.118.2.36 Thu Mar 17 12:21:02 2005
+++ php-src/ext/exif/exif.c Tue Mar 22 17:07:03 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.118.2.36 2005/03/17 17:21:02 iliaa Exp $ */
+/* $Id: exif.c,v 1.118.2.37 2005/03/22 22:07:03 edink Exp $ */
/* ToDos
*
@@ -70,6 +70,9 @@
/* needed for ssize_t definition */
#include <sys/types.h>
+#if defined(PHP_WIN32) && !defined(ssize_t)
+typedef SSIZE_T ssize_t;
+#endif
typedef unsigned char uchar;
@@ -104,7 +107,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.36 2005/03/17 17:21:02 iliaa
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.37 2005/03/22 22:07:03 edink
Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
http://cvs.php.net/diff.php/php-src/ext/exif/exif.dsp?r1=1.8.4.1&r2=1.8.4.2&ty=u
Index: php-src/ext/exif/exif.dsp
diff -u php-src/ext/exif/exif.dsp:1.8.4.1 php-src/ext/exif/exif.dsp:1.8.4.2
--- php-src/ext/exif/exif.dsp:1.8.4.1 Wed Jun 25 09:21:54 2003
+++ php-src/ext/exif/exif.dsp Tue Mar 22 17:07:03 2005
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib php4ts.lib /nologo /dll /machine:I386
/out:"..\..\Release_TS/php_exif.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib php4ts.lib php_mbstring.lib /nologo /dll /machine:I386
/out:"..\..\Release_TS/php_exif.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "exif - Win32 Debug_TS"
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.dsp?r1=1.12.2.6&r2=1.12.2.7&ty=u
Index: php-src/ext/mbstring/mbstring.dsp
diff -u php-src/ext/mbstring/mbstring.dsp:1.12.2.6
php-src/ext/mbstring/mbstring.dsp:1.12.2.7
--- php-src/ext/mbstring/mbstring.dsp:1.12.2.6 Thu Mar 17 19:49:32 2005
+++ php-src/ext/mbstring/mbstring.dsp Tue Mar 22 17:07:04 2005
@@ -38,7 +38,7 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
+# PROP Output_Dir "../../Release_TS"
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
