Omit the _XOPEN_SOURCE 500 define on Mac OS-X. Ticket #2673 (CVS 4450)

FossilOrigin-Name: 0bbf654b6745058a705ef5c320bdd5fb06735271

diff --git a/manifest b/manifest
index 5ca2a6d9b52bbb24021daa82f20cec6e3ab99239..e73c1ab181e4094df31f3d1c4b5dc23a0c6bb6e1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sbuild\sprocess\sso\sthat\sit\sincludes\ssqlite3ext.h\swith\sthe\namalgamation\sZIP\sarchive.\s\sTicket\s#2678.\s(CVS\s4449)
-D 2007-10-01T13:59:49
+C Omit\sthe\s_XOPEN_SOURCE\s500\sdefine\son\sMac\sOS-X.\s\sTicket\s#2673\s(CVS\s4450)
+D 2007-10-01T14:30:15
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -132,7 +132,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 82089379833e361ba8a2ae65316a2173785300c0
 F src/sqlite.h.in 60d1a884f49304787b07864ceba31e6df93a5a7c
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
-F src/sqliteInt.h ab7d3169cbfa911335fd94a61f22f052a9f5adeb
+F src/sqliteInt.h cb503be6d432493c877674e129369d928441bc0a
 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12
 F src/table.c 1aeb9eab57b4235db86fe15a35dec76fb445a9c4
 F src/tclsqlite.c 9659ec914abfdb35e184eee908d07eba11a39018
@@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P f7a2647033817c73f40010e145e4c29173a55689
-R 6d5b9658c78173a7eca5c77bdddf5d48
+P 6232ee6750562b2cb913af4bb26111a097dd1192
+R b232fb71e14846726c7d6a58e91d11d1
 U drh
-Z 430256babf97efbbcb65847b3651c78e
+Z 5ca45cfd76a3eb06a9dad300fffb2aa0

diff --git a/manifest.uuid b/manifest.uuid
index 5a8028c6c7f4d3ab6a4b50f9824c5fffe72af8eb..0ba2deb74f6b600be2ec120d304f58e21adf0211 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6232ee6750562b2cb913af4bb26111a097dd1192
\ No newline at end of file
+0bbf654b6745058a705ef5c320bdd5fb06735271
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 657ea74f56429cd77b4c1e44562aff9354e864cb..82e3470dc2685305c2fa068b4a651236d8b1ae98 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.610 2007/09/21 04:28:16 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.611 2007/10/01 14:30:15 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -59,7 +59,15 @@
   extern int sqlite3MAX_LIKE_PATTERN_LENGTH;
 #endif
 
-#define _XOPEN_SOURCE 500  /* Needed to enable pthread recursive mutexes */
+/*
+** We need to define _XOPEN_SOURCE as follows in order to enable
+** recursive mutexes on most unix systems.  But Mac OS X is different.
+** The _XOPEN_SOURCE define causes problems for Mac OS X we are told,
+** so it is omitted there.  See ticket #2673.
+*/
+#ifndef __MACOS__
+#  define _XOPEN_SOURCE 500  /* Needed to enable pthread recursive mutexes */
+#endif
 
 #if defined(SQLITE_TCL) || defined(TCLSH)
 # include <tcl.h>