p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 30c168c5: am ae25aed3: am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H." 

* commit '30c168c570deb48f5ad0de0821f2fea0d149a635':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
This commit is contained in:
Narayan Kamath 2015-02-21 10:27:59 +00:00 committed by Android Git Automerger
parent 7f9219281e 30c168c570
commit 8e3d3737d8
1 changed files with 5 additions and 15 deletions
Show Stats 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
*/ */