qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: NO-JIRA: Replace user-defined macro WIN32 by compiler-defined _WIN32
Date Fri, 24 Aug 2018 16:08:42 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 213a7aa41 -> 8d8a0b545


NO-JIRA: Replace user-defined macro WIN32 by compiler-defined _WIN32

More information:
https://stackoverflow.com/questions/662084/whats-the-difference-between-the-win32-and-win32-defines-in-c

Closes #154


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8d8a0b54
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8d8a0b54
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8d8a0b54

Branch: refs/heads/master
Commit: 8d8a0b545ce7a8c8bfc31eee9dbe953985bfdbfd
Parents: 213a7aa
Author: Matthieu Longo <mateo.longo@gmail.com>
Authored: Wed Aug 22 15:53:01 2018 +0200
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Fri Aug 24 12:06:59 2018 -0400

----------------------------------------------------------------------
 c/include/proton/import_export.h       | 4 ++--
 cpp/examples/ssl.cpp                   | 2 +-
 cpp/examples/ssl_client_cert.cpp       | 2 +-
 cpp/include/proton/internal/export.hpp | 4 ++--
 cpp/src/uuid.cpp                       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8d8a0b54/c/include/proton/import_export.h
----------------------------------------------------------------------
diff --git a/c/include/proton/import_export.h b/c/include/proton/import_export.h
index 14e6b82..951396b 100644
--- a/c/include/proton/import_export.h
+++ b/c/include/proton/import_export.h
@@ -33,7 +33,7 @@
   PN_IMPORT         - Import declaration
 */
 
-#if defined(WIN32) && !defined(PROTON_DECLARE_STATIC)
+#if defined(_WIN32) && !defined(PROTON_DECLARE_STATIC)
 /* Import and Export definitions for Windows: */
 #  define PN_EXPORT __declspec(dllexport)
 #  define PN_IMPORT __declspec(dllimport)
@@ -66,7 +66,7 @@
 #endif
 
 #if ! defined(PN_USE_DEPRECATED_API)
-#  if defined(WIN32)
+#  if defined(_WIN32)
 #    define PN_DEPRECATED(message) __declspec(deprecated(message))
 #  elif defined __GNUC__
 #    if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40500

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8d8a0b54/cpp/examples/ssl.cpp
----------------------------------------------------------------------
diff --git a/cpp/examples/ssl.cpp b/cpp/examples/ssl.cpp
index cd5e48e..c3265be 100644
--- a/cpp/examples/ssl.cpp
+++ b/cpp/examples/ssl.cpp
@@ -184,7 +184,7 @@ int main(int argc, char **argv) {
 
 bool using_OpenSSL() {
     // Current defaults.
-#if defined(WIN32)
+#if defined(_WIN32)
     return false;
 #else
     return true;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8d8a0b54/cpp/examples/ssl_client_cert.cpp
----------------------------------------------------------------------
diff --git a/cpp/examples/ssl_client_cert.cpp b/cpp/examples/ssl_client_cert.cpp
index 4656ca2..8c92abf 100644
--- a/cpp/examples/ssl_client_cert.cpp
+++ b/cpp/examples/ssl_client_cert.cpp
@@ -157,7 +157,7 @@ int main(int argc, char **argv) {
 
 bool using_OpenSSL() {
     // Current defaults.
-#if defined(WIN32)
+#if defined(_WIN32)
     return false;
 #else
     return true;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8d8a0b54/cpp/include/proton/internal/export.hpp
----------------------------------------------------------------------
diff --git a/cpp/include/proton/internal/export.hpp b/cpp/include/proton/internal/export.hpp
index d7a365d..a0c20b9 100644
--- a/cpp/include/proton/internal/export.hpp
+++ b/cpp/include/proton/internal/export.hpp
@@ -25,7 +25,7 @@
 /// @cond INTERNAL
 
 /// import/export macros
-#if defined(WIN32) && !defined(PN_CPP_DECLARE_STATIC)
+#if defined(_WIN32) && !defined(PN_CPP_DECLARE_STATIC)
   //
   // Import and Export definitions for Windows:
   //
@@ -62,7 +62,7 @@
 #else
 #  if defined(PN_COMPILER_CXX_ATTRIBUTE_DEPRECATED) && PN_COMPILER_CXX_ATTRIBUTE_DEPRECATED
 #    define PN_CPP_DEPRECATED(message) [[deprecated(message)]]
-#  elif defined(WIN32)
+#  elif defined(_WIN32)
 #    define PN_CPP_DEPRECATED(message) __declspec(deprecated(message))
 #  elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40500
 #    define PN_CPP_DEPRECATED(message) __attribute__((deprecated))

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8d8a0b54/cpp/src/uuid.cpp
----------------------------------------------------------------------
diff --git a/cpp/src/uuid.cpp b/cpp/src/uuid.cpp
index 861d707..d114388 100644
--- a/cpp/src/uuid.cpp
+++ b/cpp/src/uuid.cpp
@@ -27,7 +27,7 @@
 #include <sstream>
 #include <iomanip>
 
-#ifdef WIN32
+#if defined(_WIN32)
 #include <process.h>
 #define GETPID _getpid
 #else


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message