Permalink
Browse files

added ue4 preprocessor flag

  • Loading branch information...
Turupawn committed Dec 28, 2018
1 parent 81165ad commit 7224ca4179ab5bf44e86ddd6048f1222fea7e51c
@@ -409,7 +409,11 @@
/* ws2tcpip.h is required here to properly make type definitions below. */
#ifdef CURL_PULL_WS2TCPIP_H
# include <winsock2.h>
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
# include <ws2tcpip.h>
#endif

@@ -219,7 +219,11 @@
# ifdef FAR
# undef FAR
# endif
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define ZEXPORT WINAPI
@@ -54,7 +54,11 @@
# include <stdarg.h>

# if GTEST_OS_WINDOWS
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
# else
# include <sys/mman.h>
# include <sys/wait.h>
@@ -34,7 +34,11 @@
#include "gtest/gtest-message.h"

#if GTEST_OS_WINDOWS_MOBILE
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
#elif GTEST_OS_WINDOWS
# include <direct.h>
# include <io.h>
@@ -54,7 +54,11 @@
#endif

#if GTEST_OS_WINDOWS
# include <windows.h> // NOLINT
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h> // NOLINT
# endif
#endif // GTEST_OS_WINDOWS

#include "gtest/gtest.h"
@@ -38,7 +38,11 @@
#include <memory>

#if GTEST_OS_WINDOWS
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
# include <io.h>
# include <sys/stat.h>
# include <map> // Used in ThreadLocal.
@@ -81,7 +81,11 @@

#elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE.

# include <windows.h> // NOLINT
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h> // NOLINT
# endif
# undef min

#elif GTEST_OS_WINDOWS // We are on Windows proper.
@@ -104,7 +108,11 @@

// cpplint thinks that the header is already included, so we want to
// silence it.
# include <windows.h> // NOLINT
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h> // NOLINT
# endif
# undef min

#else
@@ -41,7 +41,11 @@
#include "gtest/gtest.h"

#if GTEST_OS_WINDOWS
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
# include <stdlib.h>
#endif

@@ -38,7 +38,11 @@
#include "gtest/gtest.h"

#if GTEST_HAS_SEH
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
#endif

#if GTEST_HAS_EXCEPTIONS
@@ -36,7 +36,11 @@
#if GTEST_HAS_DEATH_TEST

# if GTEST_HAS_SEH
# include <windows.h> // For RaiseException().
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h> // For RaiseException().
# endif
# endif

# include "gtest/gtest-spi.h"
@@ -40,7 +40,12 @@
#include "src/gtest-internal-inl.h"

#if GTEST_OS_WINDOWS_MOBILE
# include <windows.h> // NOLINT

# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h> // NOLINT
# endif
#elif GTEST_OS_WINDOWS
# include <direct.h> // NOLINT
#endif // GTEST_OS_WINDOWS_MOBILE
@@ -39,7 +39,11 @@
#include "gtest/gtest.h"

#if GTEST_OS_WINDOWS_MOBILE
# include <windows.h>
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
#elif GTEST_OS_WINDOWS
# include <direct.h>
#endif // GTEST_OS_WINDOWS_MOBILE
@@ -19,6 +19,10 @@
#define MODIO_WINDOWS_DETECTED
#endif

#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_WINDOWS)
# define MODIO_UE4_DETECTED
#endif

#include <iostream>
#include <vector>
#include <string.h>
@@ -37,9 +41,13 @@
#endif

#ifdef MODIO_WINDOWS_DETECTED
#include <windows.h>
#include <strsafe.h>
#include "dependencies/dirent/dirent.h"
# ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
# else
# include <windows.h>
# endif
# include <strsafe.h>
# include "dependencies/dirent/dirent.h"
//#include "vld.h"
#endif

@@ -15,7 +15,11 @@
#ifndef _IOWIN32_H
#define _IOWIN32_H

#include <windows.h>
#ifdef MODIO_UE4_DETECTED
# include <Windows/MinWindows.h>
#else
# include <windows.h> // NOLINT
#endif

#ifdef __cplusplus
extern "C" {

0 comments on commit 7224ca4

Please sign in to comment.