Use compiler defined _WIN32 to test for Windows if it is available.

Author: Dale Wilson

examples/cpp98/SbeExample.cpp

@@ -24,7 +24,7 @@
 using namespace std;
 using namespace baseline;
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 # define snprintf _snprintf
 #endif /* WIN32 */
 

examples/cpp98/SbeOtfDecoder.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -319,7 +319,7 @@ int main(int argc, char * const argv[])
  CarCallbacks carCbs(listener);
  char *buffer = NULL;
  int length = 0, ch, justHeader = 0;
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  int optind = 1;
 
  if (strcmp(argv[optind], "-?") == 0)

main/cpp/otf_api/Ir.cpp

@@ -51,7 +51,7 @@ struct Ir::Impl
  ::uint32_t serializedTokenSize;
 };
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(_WIN32)
 const int Ir::INVALID_ID;
 const ::uint32_t Ir::VARIABLE_SIZE;
 #endif /* WIN32 */

main/cpp/otf_api/IrCollection.h

@@ -16,7 +16,7 @@
 #ifndef _IR_COLLECTION_H_
 #define _IR_COLLECTION_H_
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <io.h>

main/cpp/otf_api/Listener.cpp

@@ -24,7 +24,7 @@
  * builtins for GCC. MSVC has similar ones.
  */
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  #define BSWAP16(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_ushort((::uint16_t)v))
  #define BSWAP32(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_ulong((::uint32_t)v))
  #define BSWAP64(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_uint64((::uint64_t)v))
@@ -44,11 +44,11 @@ using namespace sbe::on_the_fly;
 using ::std::cout;
 using ::std::endl;
 
-#if !defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
+#define snprintf _snprintf
+#else
 const ::int32_t Field::INVALID_ID;
 const int Field::FIELD_INDEX;
-#else
-#define snprintf _snprintf
 #endif /* WIN32 */
 
 Listener::Listener() : onNext_(NULL), onError_(NULL), onCompleted_(NULL),

main/cpp/sbe/sbe.hpp

@@ -39,7 +39,7 @@ namespace sbe {
 /*
  * Define some byte ordering macros
  */
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  #define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
  #define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
  #define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
@@ -66,7 +66,7 @@ namespace sbe {
 
 #if defined(SBE_NO_BOUNDS_CHECK)
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(_WIN32)
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
 #else
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))

perf/cpp/benchlet.hpp

@@ -26,7 +26,7 @@
 # include <mach/mach_time.h>
 #elif defined(__linux__)
 # include <time.h>
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(_WIN32)
 # include <windows.h>
 #else
 # error "Must define Darwin or __linux__ or WIN32"
@@ -211,7 +211,7 @@ class BenchmarkRunner
  {
  return end_timestamp - start_timestamp;
  };
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(_WIN32)
  static uint64_t currentTimestamp(void)
  {
  static LARGE_INTEGER freq;

perf/resources/sbe/sbe.hpp

@@ -40,7 +40,7 @@ namespace sbe {
  * Define some byte ordering macros
  * These use gcc builtins. MSVC should be similar.
  */
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  #define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
  #define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
  #define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)