Makefile.lib libs/basekit/depends libs/jfile/depends libs/skipdb/depends libs/udb/depends @@ -6,7 +6,7 @@ all: cd libs/jfile/tests; make cd libs/udb; make cd libs/skipdb; make - cd libs/tagdb; make + #cd libs/tagdb; make clean: cd libs/basekit; make clean @@ -14,7 +14,7 @@ clean: cd libs/jfile/tests; make clean cd libs/udb; make clean cd libs/skipdb; make clean - cd libs/tagdb; make clean + #cd libs/tagdb; make clean test: cd libs/jfile/tests; ./test Makefile @@ -49,7 +49,9 @@ typedef long long int64_t; #define ON_WINDOWS 1 // Enable fibers +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0400 +#endif // this also includes windows.h #include <winsock2.h> @@ -76,6 +78,12 @@ as errors in my dev settings */ #pragma warning( disable : 4244 ) /* warning C4244: 'function' : conversion from 'double ' to 'int ', possible loss of data */ +#pragma warning( disable : 4996 ) +/* warning C4996: 'function' : This function or variable may be unsafe. Consider using 'function_s' instead */ + +#pragma warning( disable : 4018 ) +/* warning C4018: 'operator' : signed/unsigned mismatch */ + /*#pragma warning( disable : 4090 ) */ /* warning C4090: 'function' : different 'const' qualifiers */ @@ -177,6 +185,7 @@ BASEKIT_API void *cpalloc(const void *p, size_t size); BASEKIT_API void *io_freerealloc(void *p, size_t size); int io_isBigEndian(void); +BASEKIT_API uint32_t io_uint32InBigEndian(uint32_t i); #ifdef __cplusplus } libs/basekit/source/Common.h @@ -27,8 +27,15 @@ Kudos to Daniel A. Koepke #include "TargetConditionals.h" #endif -#if defined __GNUC__ && __GNUC__ >= 4 //&& FALSE -//#if defined TARGET_ASPEN_SIMULATOR || TARGET_OS_ASPEN +#if defined __XCODE__ && (TARGET_ASPEN_SIMULATOR || TARGET_OS_ASPEN) + #define NON_EXTERN_INLINES +#else + #if defined __GNUC__ && __GNUC__ >= 4 + //#define NON_EXTERN_INLINES + #endif +#endif + +#ifdef NON_EXTERN_INLINES #ifdef IO_IN_C_FILE // in .c libs/basekit/source/Common_inline.h 896fa7bd84ff5354b75278826ee9a9dc47110c52 Steve Dekorte steve@StevesLaptop-7.local http://github.com/stevedekorte/skipdb/commit/23d42f5d3c160de348c9a715514786e62e0cde7a 23d42f5d3c160de348c9a715514786e62e0cde7a 2009-08-07T15:19:48-07:00 2009-08-07T15:19:48-07:00 adding Makefile.lib and depends files 43672207111c2c0c9dd5f6a36f541670fa95ba5c Steve Dekorte steve@StevesLaptop-7.local