StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."

Browse Source
This commit is contained in:
Narayan Kamath
2015-02-21 10:01:48 +00:00
committed by Gerrit Code Review
parent 0f672c6aad 2fad00c56e
commit 940632f1a1
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/combo/include/arch/windows/AndroidConfig.h
View File

@@ -58,19 +58,19 @@
/* TODO: replace references to this. */ /* TODO: replace references to this. */
#define HAVE_WIN32_IPC #define HAVE_WIN32_IPC
#ifdef __CYGWIN__
#error "CYGWIN is unsupported for platform builds"
#endif
/* /*
* Define this if you build against MSVCRT.DLL * Define this if you build against MSVCRT.DLL
*/ */
#ifndef __CYGWIN__ #define HAVE_MS_C_RUNTIME
# define HAVE_MS_C_RUNTIME
#endif
/* /*
* Define this if we want to use WinSock. * Define this if we want to use WinSock.
*/ */
#ifndef __CYGWIN__
#define HAVE_WINSOCK #define HAVE_WINSOCK
#endif
/* /*
* We need to choose between 32-bit and 64-bit off_t. All of our code should * We need to choose between 32-bit and 64-bit off_t. All of our code should
@@ -94,16 +94,6 @@
*/ */
#define OS_PATH_SEPARATOR '\\' #define OS_PATH_SEPARATOR '\\'
/*
* Define if <winsock2.h> exists.
* Only MinGW has it.
*/
#ifdef USE_MINGW
#define HAVE_WINSOCK2_H 1
#else
/* #define HAVE_WINSOCK2_H */
#endif
/* /*
* Various definitions missing in MinGW * Various definitions missing in MinGW
*/ */