transactd 1.2.0 → 2.0.0

data/source/bzs/env/compiler.h

@@ -1,5 +1,5 @@
-#ifndef	BZS_ENV_COMPILER_H
-#define	BZS_ENV_COMPILER_H
+#ifndef BZS_ENV_COMPILER_H
+#define BZS_ENV_COMPILER_H
 /*=================================================================
    Copyright (C) 2012 2013 BizStation Corp All rights reserved.
 
@@ -18,124 +18,181 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
-
-#if (__BCPLUSPLUS__ && !defined(__clang__))
-#	define __THREAD __thread
-#	define __STDCALL __stdcall
+// function type
+#if (__BCPLUSPLUS__)
+#if (defined(__APPLE__) || defined(__clang__))
+#define __THREAD __declspec(thread)
+#define __STDCALL
+#else
+#define __THREAD __thread
+#define __STDCALL __stdcall
+#endif
 #else
-#	define __THREAD __declspec(thread)
-#	if (_MSC_VER || (__BORLANDC__ && __clang__) || __MINGW32__)
-#		define __STDCALL __stdcall
-#	else
-#		define __STDCALL
-#	endif
+#define __THREAD __declspec(thread)
+#if (_MSC_VER || __MINGW32__)
+#define __STDCALL __stdcall
+#else
+#define __STDCALL
+#endif
 #endif
 
+// operating system
 #ifdef _WIN32
-#	ifdef _WIN64
-#		ifndef __x86_64__
-#			define __x86_64__
-#		endif
-#	else
-#		define __x86_32__
-#	endif
+#ifdef _WIN64
+#ifndef __x86_64__
+#define __x86_64__
+#endif
 #else
-#	ifndef LINUX
-#		define LINUX //Support 64bit only
-#	endif
+#define __x86_32__
 #endif
-
-
-
-
-#undef PACKAGE
-
+#else
+#ifndef LINUX
+#define LINUX 1 // Support 64bit only
+#endif
+#endif
+#if (__BCPLUSPLUS__ && defined(__APPLE__))
+#define __APPLE_32__ 1
+#endif
+// thread strage
 #ifndef __THREAD_BCB
-#	undef __THREAD
-#	if (__BCPLUSPLUS__ && !defined(__clang__))
-#		define __THREAD_BCB __thread
-#		define __THREAD
-#	else
-#		define __THREAD_BCB
-#		if (_MSC_VER || (__BORLANDC__ && __clang__))
-#			define __THREAD __declspec(thread)
-#		else
-#			define __THREAD __thread
-#		endif
-#	endif
-#endif//__THREAD_BCB
+#undef __THREAD
+#if (__BCPLUSPLUS__ && !defined(__clang__))
+#define __THREAD_BCB __thread
+#define __THREAD
+#else
+#define __THREAD_BCB
+#if (_MSC_VER || (__BORLANDC__ && __clang__))
+#define __THREAD __declspec(thread)
+#else
+#define __THREAD __thread
+#endif
+#endif
+#endif //__THREAD_BCB
 
+// BCB_64
+#if (__BCPLUSPLUS__ && defined(__clang__))
+#define BCB_64
+#endif
 
+// BCB32
+#if (__BCPLUSPLUS__ && defined(__x86_32__))
+#define BCB_32
+#endif
 
+// export
+#undef PACKAGE
 #ifdef __BCPLUSPLUS__
-#	ifndef PACKAGE
-#		ifdef __x86_64__
-#			define PACKAGE __declspec(dllexport)
-#		else
-#			define PACKAGE __declspec(package)
-#		endif
-#	endif
+#ifndef PACKAGE
+#ifdef __x86_64__
+#define PACKAGE __declspec(dllexport)
 #else
-#	if (_WIN32 && !defined(__MINGW32__))
-#		define PACKAGE __declspec(dllexport)
-#	else
-#		define PACKAGE
-#	endif
+#define PACKAGE __declspec(package)
+#endif
+#endif
+#else
+#if (_WIN32 && !defined(__MINGW32__))
+#define PACKAGE __declspec(dllexport)
+#else
+#define PACKAGE
+#endif
 #endif
-
 
 #ifdef PACKAGE_NO_EXPORT
-#	undef PACKAGE
-#	define PACKAGE
+#undef PACKAGE
+#define PACKAGE
 #endif
 
 #define AGRPACK PACKAGE
 
-// import
-#if (LINUX || __MINGW32__)
-#	define PACKAGE_IMPORT
+// bcb_osx
+#if (__BCPLUSPLUS__ && defined(__APPLE__) && !defined(__clang__))
+#define PACKAGE_OSX PACKAGE
 #else
-#	define PACKAGE_IMPORT __declspec(dllimport)
+#define PACKAGE_OSX
 #endif
 
+// import
+#if (defined(LINUX) || __MINGW32__)
+#define PACKAGE_IMPORT
+#else
+#define PACKAGE_IMPORT __declspec(dllimport)
+#endif
 
-
-
+// data alignment
 #if (_MSC_VER || (__BORLANDC__ && __clang__))
-#	define pragma_pack1 __pragma(pack(push, 1))
-#	define pragma_pop __pragma(pack(pop))
+#define pragma_pack1 __pragma(pack(push, 1))
+#define pragma_pop __pragma(pack(pop))
 #else
-#	ifdef __BCPLUSPLUS__
-#		define pragma_pack1
-#		define pragma_pop
-#	else
-#		define pragma_pack1 _Pragma("pack(1)")
-#		define pragma_pop _Pragma("pack()")
-#	endif
+#ifdef __BCPLUSPLUS__
+#define pragma_pack1
+#define pragma_pop
+#else
+#define pragma_pack1 _Pragma("pack(1)")
+#define pragma_pop _Pragma("pack()")
+#endif
 #endif
 
-#if (_MSC_VER == 1600) 
-#	define COMPILER_VERSTR "vc100"
+// compiler name
+#if (_MSC_VER == 1600)
+#define COMPILER_VERSTR "vc100"
 #endif
 
 #if (_MSC_VER == 1700)
-#	define COMPILER_VERSTR "vc110"
+#define COMPILER_VERSTR "vc110"
+#endif
+
+#if (_MSC_VER == 1800)
+#define COMPILER_VERSTR "vc120"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x630 && (__BCPLUSPLUS__ < 0x640))
-#	define COMPILER_VERSTR  "bcb"
+#define COMPILER_VERSTR "bc150"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x640 && (__BCPLUSPLUS__ < 0x650))
-#	define COMPILER_VERSTR  "bcb"
+#define COMPILER_VERSTR "bc160"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x650 && (__BCPLUSPLUS__ < 0x660))
-#	define COMPILER_VERSTR  "bcb"
+#define COMPILER_VERSTR "bc170"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x660 && (__BCPLUSPLUS__ < 0x670))
-#	define COMPILER_VERSTR  "bcb"
+#define COMPILER_VERSTR "bc180"
+#endif
+
+#if (__BCPLUSPLUS__ >= 0x670 && (__BCPLUSPLUS__ < 0x680))
+#define COMPILER_VERSTR "bc190"
+#endif
+
+#if (__BCPLUSPLUS__ >= 0x680 && (__BCPLUSPLUS__ < 0x690))
+#define COMPILER_VERSTR "bc200"
+#endif
+
+#if (__BCPLUSPLUS__ >= 0x690 && (__BCPLUSPLUS__ < 0x700))
+#define COMPILER_VERSTR "bc210"
+#endif
+
+#if (__APPLE__)
+#define SHARED_LIB_EXTENTION ".dylib"
+#else
+#if (defined(LINUX) || (__BORLANDC__ && __clang__))
+#define SHARED_LIB_EXTENTION ".a"
+#else
+#define SHARED_LIB_EXTENTION ".lib"
+#endif
+#endif
+
+#if (defined(LINUX) || (__BORLANDC__ && __clang__))
+#define LIB_EXTENTION ".a"
+#else
+#define LIB_EXTENTION ".lib"
+#endif
+
+#ifdef LINUX
+#define LIB_PREFIX "lib"
+#else
+#define LIB_PREFIX
 #endif
 
-#endif//BZS_ENV_COMPILER_H
+#endif // BZS_ENV_COMPILER_H

data/source/bzs/env/crosscompile.cpp

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #ifdef LINUX
@@ -23,108 +23,108 @@
 #include <wctype.h>
 #include <wchar.h>
 
-
 char16_t* _strupr16(char16_t* s)
 {
-	char16_t* p = s;
-	while (*s)
-	{
-		*s = towupper(*s);
-		++s;
-	}
-	return p;
+    char16_t* p = s;
+    while (*s)
+    {
+        *s = towupper(*s);
+        ++s;
+    }
+    return p;
 }
 
 char16_t* _strlwr16(char16_t* s)
 {
-	char16_t* p = s;
-	while (*s)
-	{
-		*s = towlower(*s);
-		++s;
-	}
-	return p;
+    char16_t* p = s;
+    while (*s)
+    {
+        *s = towlower(*s);
+        ++s;
+    }
+    return p;
 }
 
 char* _strupr(char* s)
 {
-	char* p = s;
-	while (*s)
-	{
-		*s = toupper(*s);
-		++s;
-	}
-	return p;
+    char* p = s;
+    while (*s)
+    {
+        *s = toupper(*s);
+        ++s;
+    }
+    return p;
 }
 
 char* _strlwr(char* s)
 {
-	char* p = s;
-	while (*s)
-	{
-		*s = tolower(*s);
-		++s;
-	}
-	return p;
+    char* p = s;
+    while (*s)
+    {
+        *s = tolower(*s);
+        ++s;
+    }
+    return p;
 }
 
 char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix)
 {
-	snprintf(tmp,size, "%Ld", v);
-	return tmp;
+    snprintf(tmp, size, "%lld", v);
+    return tmp;
 }
 
 char* _ltoa_s(int v, char* tmp, unsigned long size, int radix)
 {
-	snprintf(tmp,size, "%d", v);
-	return tmp;
+    snprintf(tmp, size, "%d", v);
+    return tmp;
 }
 
-int wcsnicmp16(const char16_t *sl, const char16_t *sr, size_t n)
+int wcsnicmp16(const char16_t* sl, const char16_t* sr, size_t n)
 {
-    if (n == 0) return 0;
+    if (n == 0)
+        return 0;
     while (*sl)
     {
-    	wchar_t tmpl = towlower(*sl);
-    	wchar_t tmpr = towlower(*sr);
-        
+        wchar_t tmpl = towlower(*sl);
+        wchar_t tmpr = towlower(*sr);
+
         if (tmpl != tmpr)
-        	return (int)(tmpl - tmpr);
-        if (--n == 0)  return 0;
+            return (int)(tmpl - tmpr);
+        if (--n == 0)
+            return 0;
         ++sl;
         ++sr;
     }
     return 0 - *sr;
 }
 
-int wcsncmp16(const char16_t *sl, const char16_t *sr, size_t n)
+int wcsncmp16(const char16_t* sl, const char16_t* sr, size_t n)
 {
-    if (n == 0) return 0;
+    if (n == 0)
+        return 0;
     while (*sl)
     {
         if (*sl != *sr)
-        	return (int)(*sl - *sr);
-        if (--n == 0)  return 0;
+            return (int)(*sl - *sr);
+        if (--n == 0)
+            return 0;
         ++sl;
         ++sr;
     }
     return 0 - *sr;
 }
 
-char16_t* wmemset16(char16_t* p , char16_t c, size_t n)
+char16_t* wmemset16(char16_t* p, char16_t c, size_t n)
 {
-	char16_t* end = p + n;
-	for (char16_t* tmp = p; tmp < end; ++tmp)
-		*tmp = c;
-	return p;
+    char16_t* end = p + n;
+    for (char16_t* tmp = p; tmp < end; ++tmp)
+        *tmp = c;
+    return p;
 }
 
 char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count)
 {
-	return (char16_t*)memcpy(dest, src, count*sizeof(char16_t));
-}	
-
-
-#endif //LINUX
-
+    return (char16_t*)memcpy(dest, src, count * sizeof(char16_t));
+}
 
+#endif // LINUX