scottmac Fri Nov 7 12:58:08 2008 UTC
Modified files:
/php-src/ext/sqlite3/libsqlite sqlite3.h
Log:
MFB fix VC6 build
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.h?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.6
php-src/ext/sqlite3/libsqlite/sqlite3.h:1.7
--- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.6 Mon Sep 15 01:17:48 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.h Fri Nov 7 12:58:08 2008
@@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
**
-** @(#) $Id: sqlite3.h,v 1.6 2008/09/15 01:17:48 scottmac Exp $
+** @(#) $Id: sqlite3.h,v 1.7 2008/11/07 12:58:08 scottmac Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -57,7 +57,7 @@
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
/* GCC added the deprecated attribute in version 3.1 */
#define SQLITE_DEPRECATED __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && _MSC_VER >= 1300
#define SQLITE_DEPRECATED __declspec(deprecated)
#else
#define SQLITE_DEPRECATED
@@ -70,7 +70,7 @@
/* I can confirm that it does not work on version 4.1.0... */
/* First appears in GCC docs for version 4.3.0 */
#define SQLITE_EXPERIMENTAL __attribute__ ((warning ("is experimental")))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && _MSC_VER >= 1500
#define SQLITE_EXPERIMENTAL __declspec(deprecated("was declared
experimental"))
#else
#define SQLITE_EXPERIMENTAL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
