Removing a bunch of unnecessary defines in compat files.

Author: stgates

Release/include/compat/apple_compat.h

@@ -21,8 +21,8 @@
  * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
  ****/
 
-
 #pragma once
+
 #include <cstdint>
 #include <string>
 #include <sstream>
@@ -38,51 +38,16 @@
 #define __declspec(x) __attribute__ ((x))
 #define __export __attribute__ ((dllexport))
 #define __stdcall __attribute__ ((stdcall))
-#define STDMETHODCALLTYPE __export __stdcall
+#define STDMETHODCALLTYPE __export __stdcall // TODO remove on Linux...
 
 // ignore these:
 #define dllimport 
 
-// OpenProt defines
-#define _SH_DENYRW 0x20
-
 #include <stdint.h>
 
 #define __assume(x) do { if (!(x)) __builtin_unreachable(); } while (false)
 
-typedef uint32_t HRESULT;
-
-#define SOCKET int
-#define SOCKET_ERROR -1
-
-#define S_OK 0
-#define S_FALSE 1
-#define STG_E_CANTSAVE 0x80030103
-#define STG_E_INVALIDPOINTER 0x80030009
-#define E_NOTIMPL 0x80004001
-#define E_NOINTERFACE 0x80004002
-
-typedef unsigned long ULONG;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-
-typedef struct _SYSTEMTIME {
-  WORD wYear;
-  WORD wMonth;
-  WORD wDayOfWeek;
-  WORD wDay;
-  WORD wHour;
-  WORD wMinute;
-  WORD wSecond;
-  WORD wMilliseconds;
-} SYSTEMTIME, *PSYSTEMTIME;
-
-#define ULARGE_INTEGER uint64_t
-#define LARGE_INTEGER int64_t
-
-#define WINAPI __stdcall
-
-#define YieldProcessor() __asm__ __volatile__ ("pause")
+#define WINAPI __stdcall // TODO
 
 #define CASABLANCA_UNREFERENCED_PARAMETER(x) (void)x
 #define _ASSERTE(x) assert(x)
@@ -102,6 +67,3 @@ typedef std::basic_ostringstream<char16_t> utf16ostringstream;
 typedef std::basic_ostream<char16_t> utf16ostream;
 typedef std::basic_istream<char16_t> utf16istream;
 typedef std::basic_istringstream<char16_t> utf16istringstream;
-
-#include "compat/SafeInt3.hpp"
-typedef SafeInt<size_t> SafeSize;

Release/include/compat/linux_compat.h

@@ -44,32 +44,12 @@
 #define cdecl
 #endif
 
-// OpenProt defines
-#define _SH_DENYRW 0x20
-
 #include <stdint.h>
 
 #define __assume(x) do { if (!(x)) __builtin_unreachable(); } while (false)
 
-typedef uint32_t HRESULT;
-
-#define SOCKET int
-#define SOCKET_ERROR -1
-
-#define S_OK 0
-#define S_FALSE 1
-#define STG_E_CANTSAVE 0x80030103
-#define STG_E_INVALIDPOINTER 0x80030009
-#define E_NOTIMPL 0x80004001
-#define E_NOINTERFACE 0x80004002
-
-#define ULARGE_INTEGER uint64_t
-#define LARGE_INTEGER int64_t
-
 #define WINAPI __stdcall
 
-#define YieldProcessor() __asm__ __volatile__ ("pause")
-
 #define CASABLANCA_UNREFERENCED_PARAMETER(x) (void)x
 #define _ASSERTE(x) assert(x)
 
@@ -89,6 +69,3 @@ typedef std::basic_ostream<char16_t> utf16ostream;
 typedef std::basic_istream<char16_t> utf16istream;
 typedef std::basic_istringstream<char16_t> utf16istringstream;
 
-#include "compat/SafeInt3.hpp"
-typedef SafeInt<size_t> SafeSize;
-

Release/include/compat/windows_compat.h

@@ -26,7 +26,6 @@
 ****/
 #pragma once
 
-#include "compat\safeint3.hpp"
 #include <string>
 
 #if _MSC_VER >= 1700
@@ -52,12 +51,4 @@ typedef std::wstringstream utf16stringstream;
 typedef std::wostringstream utf16ostringstream;
 typedef std::wostream utf16ostream;
 typedef std::wistream utf16istream;
-typedef std::wistringstream utf16istringstream;
-
-#define _XPLATSTR(x) L ## x
-
-#ifndef _TURN_OFF_PLATFORM_STRING
-#define U(x) _XPLATSTR(x)
-#endif // !_TURN_OFF_PLATFORM_STRING
-
-typedef SafeInt<size_t> SafeSize;
+typedef std::wistringstream utf16istringstream;

Release/include/cpprest/basic_types.h

@@ -40,6 +40,9 @@
 #include <cstdint>
 #endif
 
+#include "compat/SafeInt3.hpp"
+typedef SafeInt<size_t> SafeSize;
+
 namespace utility
 {
 
@@ -51,6 +54,10 @@ namespace utility
 // not involve specifying the size of a memory allocation or buffer.
 typedef uint64_t size64_t;
 
+#ifndef _MS_WINDOWS
+typedef uint32_t HRESULT; // Needed for PPLX
+#endif
+
 #ifdef _UTF16_STRINGS
 //
 // On Windows, all strings are wide

Release/include/cpprest/containerstream.h

@@ -65,12 +65,12 @@ namespace Concurrency { namespace streams {
     namespace details {
 
     /// <summary>
-        /// The basic_container_buffer class serves as a memory-based steam buffer that supports writing or reading
+    /// The basic_container_buffer class serves as a memory-based steam buffer that supports writing or reading
     /// sequences of characters.
-        /// The class itself should not be used in application code, it is used by the stream definitions farther down in the header file.
+    /// The class itself should not be used in application code, it is used by the stream definitions farther down in the header file.
     /// </summary>
-        /// <remarks> When closed, neither writing nor reading is supported any longer. <c>basic_container_buffer</c> does not support simultaneous use of the buffer
-        /// for reading and writing.</remarks>
+    /// <remarks> When closed, neither writing nor reading is supported any longer. <c>basic_container_buffer</c> does not support simultaneous use of the buffer
+    /// for reading and writing.</remarks>
     template<typename _CollectionType>
     class basic_container_buffer : public streams::details::streambuf_state_manager<typename _CollectionType::value_type>
     {

Release/include/cpprest/http_client_impl.h

@@ -327,7 +327,7 @@ class _http_client_communicator
         // First see if client needs to be opened.
         auto error = open_if_required();
 
-        if (error != S_OK)
+        if (error != 0)
         {
             // Failed to open
             request->report_error(error, _XPLATSTR("Open failed"));
@@ -343,18 +343,18 @@ class _http_client_communicator
 
     unsigned long open_if_required()
     {
-        unsigned long error = S_OK;
+        unsigned long error = 0;
 
-        if( !m_opened )
+        if(!m_opened)
         {
             pplx::extensibility::scoped_critical_section_t l(m_open_lock);
 
             // Check again with the lock held
-            if ( !m_opened )
+            if (!m_opened)
             {
                 error = open();
 
-                if (error == S_OK)
+                if (error == 0)
                 {
                     m_opened = true;
                 }

Release/include/cpprest/xxpublic.h

@@ -49,7 +49,6 @@
 // for UINT_PTR types used in winsock APIs
 #ifdef _MS_WINDOWS
 #include <BaseTsd.h>
-typedef UINT_PTR SOCKET;
 #endif
 
 // for guids, used in comm.h
@@ -66,20 +65,6 @@ typedef UINT_PTR SOCKET;
 
 #define UNREACHABLE __assume(0)
 
-// for winhttp.h
-typedef void * HINTERNET;
-
-// for file io (windows.h)
-typedef void * HANDLE;
-
-#ifdef _MS_WINDOWS
-typedef void* FILE_HANDLE;
-#else
 #ifdef __clang__
 #include <cstdio>
 #endif
-typedef FILE* FILE_HANDLE;
-#endif
-
-// for http client and others that use overlapped IO delegates (windef.h)
-#define CALLBACK __stdcall