From: mlcreech Date: Thu, 6 Mar 2008 07:36:18 +0000 (+0000) Subject: Add headers for use with autoconf (missing from previous checkin) (CVS 4825) X-Git-Tag: version-3.6.10~1352 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7f59456ce17716d240ed712e380357eb0c3b65d;p=thirdparty%2Fsqlite.git Add headers for use with autoconf (missing from previous checkin) (CVS 4825) FossilOrigin-Name: 4513a5f493bb612134d04685c0d6777e0d5c65bc --- diff --git a/manifest b/manifest index ed2236afff..ed8fdd1f02 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\sintptr_t\sdefinition\sto\ssilence\swarnings\sabout\sptr-int\scasts\s(CVS\s4824) -D 2008-03-06T07:35:22 +C Add\sheaders\sfor\suse\swith\sautoconf\s(missing\sfrom\sprevious\scheckin)\s(CVS\s4825) +D 2008-03-06T07:36:18 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in 5a9dd0d69099728e0fca1a9cf2823226d276969a F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -89,7 +89,10 @@ F src/btree.h 19dcf5ad23c17b98855da548e9a8e3eb4429d5eb F src/btreeInt.h d7d2f4d9d7f2e72c455326d48b2b478b842a81f6 F src/build.c 19990e2ce78806e854b5baaa18a77b540a476bbb F src/callback.c 77b302b0d41468dcda78c70e706e5b84577f0fa0 +F src/common.h 25fa5524ee3d2617986a3ec1ba59fef195d2d009 F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131 +F src/config.h b60286b542f5284d529b659adcb9c9d25eecab20 +F src/config.h.in 276f8e51e2daf0a19136c28678ec93542ac0ebe7 F src/date.c 187cad26eaaecd7bcdccd49d5a70c5aa3010bc74 F src/delete.c fa13c296262e89c32d28949f15be275e52d7f524 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b @@ -621,7 +624,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 88698fbdd5387b195e1c04c0c597f3c7458757c5 -R 319f02e97f65970946b1dcad66344da4 +P 54839a84e6ce080ea8a0f6ce32acaa053d20f311 +R ba6f603fbcf69a52cea4b01ecdf772c7 U mlcreech -Z 98d99414f33d762bf04af83dd32456ee +Z 267ef6d6906a66247cc6933cc3edc0d5 diff --git a/manifest.uuid b/manifest.uuid index 205ad7ec2d..a0bf3dcd80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -54839a84e6ce080ea8a0f6ce32acaa053d20f311 \ No newline at end of file +4513a5f493bb612134d04685c0d6777e0d5c65bc \ No newline at end of file diff --git a/src/common.h b/src/common.h new file mode 100644 index 0000000000..5805a7e192 --- /dev/null +++ b/src/common.h @@ -0,0 +1,57 @@ +/* +** 2008 March 6 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** Common includes/defines based on output of configure script +** +** @(#) $Id: common.h,v 1.1 2008/03/06 07:36:18 mlcreech Exp $ +*/ +#ifndef _COMMON_H_ +#define _COMMON_H_ + +/* +** Include the configuration header output by 'configure' if it was run +** (otherwise we get an empty default). +*/ +#include "config.h" + +/* Needed for various definitions... */ +#define _GNU_SOURCE + +/* +** Include standard header files as necessary +*/ +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_STDLIB_H +#include +#endif +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_INTTYPES_H +#include +#endif + +/* +** If possible, use the C99 intptr_t type to define an integral type of +** equivalent size to a pointer. (Technically it's >= sizeof(void *), but +** practically it's == sizeof(void *)). We fall back to an int if this type +** isn't defined. +*/ +#ifndef HAVE_INTPTR_T + typedef int intptr_t; +#endif +#ifndef HAVE_UINTPTR_T + typedef unsigned int uintptr_t; +#endif + +#endif diff --git a/src/config.h b/src/config.h new file mode 100644 index 0000000000..7dcf2dde28 --- /dev/null +++ b/src/config.h @@ -0,0 +1,21 @@ +/* +** 2008 March 6 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** Default configuration header in case the 'configure' script is not used +** +** @(#) $Id: config.h,v 1.1 2008/03/06 07:36:18 mlcreech Exp $ +*/ +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +/* We do nothing here, since no assumptions are made by default */ + +#endif diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 0000000000..ff1d0c223e --- /dev/null +++ b/src/config.h.in @@ -0,0 +1,52 @@ +/* +** 2008 March 6 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** Configuration header template to be filled in by 'configure' script +** +** @(#) $Id: config.h.in,v 1.1 2008/03/06 07:36:18 mlcreech Exp $ +*/ +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +/* Define as 1 if you have the int8_t type */ +#undef HAVE_INT8_T + +/* Define as 1 if you have the int16_t type */ +#undef HAVE_INT16_T + +/* Define as 1 if you have the int32_t type */ +#undef HAVE_INT32_T + +/* Define as 1 if you have the int64_t type */ +#undef HAVE_INT64_T + +/* Define as 1 if you have the intptr_t type */ +#undef HAVE_INTPTR_T + +/* Define as 1 if you have the uint8_t type */ +#undef HAVE_UINT8_T + +/* Define as 1 if you have the uint16_t type */ +#undef HAVE_UINT16_T + +/* Define as 1 if you have the uint32_t type */ +#undef HAVE_UINT32_T + +/* Define as 1 if you have the uint64_t type */ +#undef HAVE_UINT64_T + +/* Define as 1 if you have the uintptr_t type */ +#undef HAVE_UINTPTR_T + +/* Define as 1 if you have the inttypes.h header */ +#undef HAVE_INTTYPES_H + +#endif