Commit 41d79bc1 authored by Sébastien Rombauts's avatar Sébastien Rombauts

Windows CE support : using standard _WIN32_WCE flag instead of WINCE

- when compiling for Windows CE, a C++ project must define the preprocessor definitions: UNDER_CE=$(CEVersion),_WIN32_WCE=$(CEVersion)
- choosing the "_WIN32_CE" form for uniformization with "_WIN32" and "_WIN32_WINNT" already used in libzmq (boost is using both forms)
- see http://msdn.microsoft.com/en-us/library/ee479161(v=winembedded.60).aspx
parent 927000fe
#if defined WINCE #if defined _WIN32_WCE
//#include "..\..\include\zmq.h" //#include "..\..\include\zmq.h"
#include "..\..\src\err.hpp" #include "..\..\src\err.hpp"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
extern "C" { extern "C" {
#endif #endif
#if !defined WINCE #if !defined _WIN32_WCE
#include <errno.h> #include <errno.h>
#endif #endif
#include <stddef.h> #include <stddef.h>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <stddef.h> #include <stddef.h>
#if defined _MSC_VER #if defined _MSC_VER
#if defined WINCE #if defined _WIN32_WCE
#include <cmnintrin.h> #include <cmnintrin.h>
#else #else
#include <intrin.h> #include <intrin.h>
......
...@@ -203,7 +203,7 @@ const char *zmq::wsa_error_no (int no_) ...@@ -203,7 +203,7 @@ const char *zmq::wsa_error_no (int no_)
void zmq::win_error (char *buffer_, size_t buffer_size_) void zmq::win_error (char *buffer_, size_t buffer_size_)
{ {
DWORD errcode = GetLastError (); DWORD errcode = GetLastError ();
#if defined WINCE #if defined _WIN32_WCE
DWORD rc = FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | DWORD rc = FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL,
SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL ); SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL );
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "../include/zmq.h" #include "../include/zmq.h"
#include <assert.h> #include <assert.h>
#if defined WINCE #if defined _WIN32_WCE
#include "..\builds\msvc\errno.hpp" #include "..\builds\msvc\errno.hpp"
#else #else
#include <errno.h> #include <errno.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp" #include "windows.hpp"
#if defined _MSC_VER #if defined _MSC_VER
#if defined WINCE #if defined _WIN32_WCE
#include <cmnintrin.h> #include <cmnintrin.h>
#else #else
#include <intrin.h> #include <intrin.h>
......
...@@ -43,7 +43,7 @@ void zmq::thread_t::start (thread_fn *tfn_, void *arg_) ...@@ -43,7 +43,7 @@ void zmq::thread_t::start (thread_fn *tfn_, void *arg_)
{ {
tfn = tfn_; tfn = tfn_;
arg =arg_; arg =arg_;
#if defined WINCE #if defined _WIN32_WCE
descriptor = (HANDLE) CreateThread (NULL, 0, descriptor = (HANDLE) CreateThread (NULL, 0,
&::thread_routine, this, 0 , NULL); &::thread_routine, this, 0 , NULL);
#else #else
......
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <ipexport.h> #include <ipexport.h>
#if !defined WINCE #if !defined _WIN32_WCE
#include <process.h> #include <process.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment