Make all include paths relative to a root directory:

* Better include path support in the VSProject scons tool.
* Various manual fixes to include paths.
This commit is contained in:
Vinnie Falco
2014-05-29 11:59:36 -07:00
parent d9755d33d0
commit ce8f56727e
261 changed files with 918 additions and 913 deletions

View File

@@ -90,9 +90,9 @@
** disabled.
*/
#if defined(_HAVE_MINGW_H)
# include "mingw.h"
#include "mingw.h"
#elif defined(_HAVE__MINGW_H)
# include "_mingw.h"
#include "_mingw.h"
#endif
/*
@@ -8503,7 +8503,7 @@ SQLITE_PRIVATE const int sqlite3one;
** Default maximum size of memory used by memory-mapped I/O in the VFS
*/
#ifdef __APPLE__
# include <TargetConditionals.h>
#include <TargetConditionals.h>
# if TARGET_OS_IPHONE
# undef SQLITE_MAX_MMAP_SIZE
# define SQLITE_MAX_MMAP_SIZE 0
@@ -9886,7 +9886,7 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefault(void);
#endif
#if SQLITE_OS_WIN
# include <windows.h>
#include <windows.h>
#endif
/*
@@ -12184,7 +12184,7 @@ SQLITE_PRIVATE int sqlite3CantopenError(int);
*/
#if !defined(SQLITE_ASCII) || \
(defined(SQLITE_ENABLE_FTS3) && defined(SQLITE_AMALGAMATION))
# include <ctype.h>
#include <ctype.h>
#endif
/*
@@ -16188,7 +16188,7 @@ static malloc_zone_t* _sqliteZone_;
** the macro SQLITE_MALLOCSIZE to the desired function name.
*/
#if defined(SQLITE_USE_MALLOC_H)
# include <malloc.h>
#include <malloc.h>
# if defined(SQLITE_USE_MALLOC_USABLE_SIZE)
# if !defined(SQLITE_MALLOCSIZE)
# define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
@@ -21745,7 +21745,7 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(void){
*/
/* #include <stdarg.h> */
#ifdef SQLITE_HAVE_ISNAN
# include <math.h>
#include <math.h>
#endif
/*
@@ -23580,22 +23580,22 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
#if SQLITE_ENABLE_LOCKING_STYLE
# include <sys/ioctl.h>
#include <sys/ioctl.h>
# if OS_VXWORKS
# include <semaphore.h>
# include <limits.h>
#include <semaphore.h>
#include <limits.h>
# else
# include <sys/file.h>
# include <sys/param.h>
#include <sys/file.h>
#include <sys/param.h>
# endif
#endif /* SQLITE_ENABLE_LOCKING_STYLE */
#if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
# include <sys/mount.h>
#include <sys/mount.h>
#endif
#ifdef HAVE_UTIME
# include <utime.h>
#include <utime.h>
#endif
/*
@@ -23608,7 +23608,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
** the SQLITE_UNIX_THREADS macro.
*/
#if SQLITE_THREADSAFE
/* # include <pthread.h> */
/* #include <pthread.h> */
# define SQLITE_UNIX_THREADS 1
#endif
@@ -31159,8 +31159,8 @@ SQLITE_API int sqlite3_os_end(void){
#if SQLITE_OS_WIN /* This file is used for Windows only */
#ifdef __CYGWIN__
# include <sys/cygwin.h>
# include <errno.h> /* amalgamator: keep */
#include <sys/cygwin.h>
#include <errno.h> /* amalgamator: keep */
#endif
/*