build/windows_clang

2020-07-17 18:01:05 +02:00
parent 47207248d4
commit ba70c7d543
53 changed files with 127 additions and 127 deletions
--- a/include/OpenThreads/Exports
+++ b/include/OpenThreads/Exports
@@ -16,7 +16,7 @@

 #include <OpenThreads/Config>

-#ifndef WIN32
+#ifndef _WIN32
    #define OPENTHREAD_EXPORT_DIRECTIVE
 #else
    #if defined( OT_LIBRARY_STATIC )
--- a/include/osg/Notify
+++ b/include/osg/Notify
@@ -126,7 +126,7 @@ public:
    void notify(osg::NotifySeverity severity, const char *message);
 };

-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)

 /** Redirects notification stream to windows debugger with use of
  * OuputDebugString functions.
--- a/include/osg/Timer
+++ b/include/osg/Timer
@@ -18,7 +18,7 @@

 namespace osg {

-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
    typedef unsigned __int64 Timer_t;
 #else
    typedef unsigned long long Timer_t;