summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2008-09-20 23:10:16 +0000
committerPierre Joye <pajoye@php.net>2008-09-20 23:10:16 +0000
commitf6b2e89ea68ebe1d68b759a1568f331a70a97938 (patch)
tree0e9cdca7b6e826952a53184e599fdc6d21ec7d7f
parenta7279c4457b6c20ada05ea0ac61ba7074edf1598 (diff)
downloadphp-git-f6b2e89ea68ebe1d68b759a1568f331a70a97938.tar.gz
- fix VC6 build
-rw-r--r--ext/sqlite3/libsqlite/sqlite3.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/sqlite3/libsqlite/sqlite3.h b/ext/sqlite3/libsqlite/sqlite3.h
index 315e8d3c1f..00ed3f5b2c 100644
--- a/ext/sqlite3/libsqlite/sqlite3.h
+++ b/ext/sqlite3/libsqlite/sqlite3.h
@@ -54,15 +54,15 @@ extern "C" {
/*
** Add the ability to mark interfaces as deprecated.
*/
-#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)
- #define SQLITE_DEPRECATED __declspec(deprecated)
+#if ZEND_GCC_VERSION >= 3001
+# define SQLITE_DEPRECATED __attribute__((deprecated))
+#elif defined(ZEND_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1300
+# define SQLITE_DEPRECATED __declspec(deprecated)
#else
- #define SQLITE_DEPRECATED
+# define SQLITE_DEPRECATED
#endif
+
/*
** Add the ability to mark interfaces as experimental.
*/
@@ -70,7 +70,7 @@ extern "C" {
/* 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