diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/fqterm_trace.cpp | 8 | ||||
| -rw-r--r-- | src/common/fqterm_trace.h | 8 | ||||
| -rw-r--r-- | src/utilities/fqwcwidth.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/common/fqterm_trace.cpp b/src/common/fqterm_trace.cpp index 867b7ad..b08d8d0 100644 --- a/src/common/fqterm_trace.cpp +++ b/src/common/fqterm_trace.cpp @@ -20,7 +20,7 @@ #include <string> -#ifdef WIN32 +#ifdef _MSC_VER #include <hash_set> #else #include <set> @@ -47,10 +47,10 @@ void setMaxTraceLevel(int max_trace_level) { << max_trace_level; } -#ifdef WIN32 +#ifdef _MSC_VER typedef stdext::hash_set<std::string> CategorySet; #else -typedef std::set<std::string> CategorySet; +typedef typename std::set<std::string> CategorySet; #endif CategorySet *getAllowedCategories() { @@ -279,7 +279,7 @@ const char *getEventName(unsigned int type) { * This assumes all Win32 compilers have 64-bit support. */ -#include <Windows.h> +#include <windows.h> #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) || defined(__WATCOMC__) #define DELTA_EPOCH_IN_USEC 11644473600000000Ui64 diff --git a/src/common/fqterm_trace.h b/src/common/fqterm_trace.h index 287a8a8..fc4b82d 100644 --- a/src/common/fqterm_trace.h +++ b/src/common/fqterm_trace.h @@ -60,8 +60,12 @@ int isAllowedCategory(const char *category, int trace_level); void addAllowedCategory(const char *category); static void soft_break() { -#if defined(WIN32) - __asm int 03h; +#ifdef WIN32 +#ifdef _MSC_VER + __asm int 03h; +#else + asm("int $0x03"); +#endif #else pause(); #endif diff --git a/src/utilities/fqwcwidth.h b/src/utilities/fqwcwidth.h index b2007bc..2eb4516 100644 --- a/src/utilities/fqwcwidth.h +++ b/src/utilities/fqwcwidth.h @@ -21,7 +21,7 @@ #ifndef FQTERM_FQWCWIDTH_H #define FQTERM_FQWCWIDTH_H -#ifdef WIN32 +#ifdef _MSC_VER #define uint32_t unsigned __int32 #define uint16_t unsigned __int16 typedef wchar_t UTF16; |