[qpid-proton] 02/05: PROTON-2077: The win_iocp code is really C++ - This allows the windows code to compile as C99 with the VS compilers that support that

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git

commit e3d8547f18920d62f48b8382777246359e3760d0
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Fri May 1 16:32:51 2020 -0400

    PROTON-2077: The win_iocp code is really C++
    - This allows the windows code to compile as C99 with the VS compilers that support that
---
 c/CMakeLists.txt                            |  2 +-
 c/src/proactor/{win_iocp.c => win_iocp.cpp} | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
index 44a9745..13a3b67 100644
--- a/c/CMakeLists.txt
+++ b/c/CMakeLists.txt
@@ -356,7 +356,7 @@ endif()
 if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK))
   if(WIN32 AND NOT CYGWIN)
     set (PROACTOR_OK iocp)
-    set (qpid-proton-proactor src/proactor/win_iocp.c src/proactor/proactor-internal.c)
+    set (qpid-proton-proactor src/proactor/win_iocp.cpp src/proactor/proactor-internal.c)
     set_source_files_properties (${qpid-proton-proactor} PROPERTIES
       COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${COMPILE_PLATFORM_FLAGS} ${LTO}"
       COMPILE_DEFINITIONS "${PLATFORM_DEFINITIONS}"
diff --git a/c/src/proactor/win_iocp.c b/c/src/proactor/win_iocp.cpp
similarity index 99%
rename from c/src/proactor/win_iocp.c
rename to c/src/proactor/win_iocp.cpp
index ae5a369..d4af496 100644
--- a/c/src/proactor/win_iocp.c
+++ b/c/src/proactor/win_iocp.cpp
@@ -34,15 +34,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <queue>
+
+#include <iostream>
 #include <list>
+#include <queue>
+#include <sstream>
 
 #include <winsock2.h>
 #include <mswsock.h>
-#include <Ws2tcpip.h>
-
-#include <iostream>
-#include <sstream>
+#include <ws2tcpip.h>
 
 #include "netaddr-internal.h" /* Include after socket/inet headers */
 #include "core/logger_private.h"


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