Changeset 842 for cpp/common

Timestamp:

12/08/18 05:33:49 (6 years ago)

Author:

Maciej Komosinski

Message:

Simple va_copy still needed for C++Builder

File:

• cpp/common/nonstd.h (modified) (2 diffs)

cpp/common/nonstd.h

@@ -20 +20 @@
 
 
-// ms visual c++
-#ifdef _MSC_VER
- #include <stdio.h> //this #include must be present before two #defines below can be used, otherwise one will see: '_vsnprintf': attributes inconsistent with previous declaration, stdio.h:358
- #define vsnprintf _vsnprintf
- #define snprintf _snprintf
-#endif
-
-#ifdef MOBILE2D
- #define strdup _strdup
-#endif
 
 /////////////////////////////////////////////////////// 64-bit int type and other macros
@@ -63 +53 @@
 #endif
 
+
 //typedef unsigned char boolean; //niestety nie mozna uzyc 'bool' bo VC w rpcndr.h wlasnie tak definiuje booleana, jako unsigned char
 //typedef char byte; //rozne srodowiska c++ definiuja byte jako unsigned char! w javie jest inaczej -> trzeba i tak zmienic w portowanych zrodlach byte na char.
+
+
+
+#ifdef __BORLANDC__
+ #define va_copy(to,from) ((to)=(from)) //borland's implementation of va_copy (the _Vacopy() function) copies from="" to to=NULL, and this behavior crashes our ssprintf_va(), so we prefer our simple macro since va_list is just a char* pointer in borland
+#endif
+
 
 //vsnprintf implementations support different standards, some only return -1 instead of the required number of characters