diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-21 10:27:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-21 10:27:59 +0000 |
| commit | 8e3d3737d82a8606d7f9935ce467e779a2bde16f (patch) | |
| tree | 9cbf850411ba4130d98cc7e8115fa15919180565 /core/combo | |
| parent | 7f9219281e0ac6b35e5d557104f0de9ebbb66641 (diff) | |
| parent | 30c168c570deb48f5ad0de0821f2fea0d149a635 (diff) | |
| download | build-8e3d3737d82a8606d7f9935ce467e779a2bde16f.zip build-8e3d3737d82a8606d7f9935ce467e779a2bde16f.tar.gz build-8e3d3737d82a8606d7f9935ce467e779a2bde16f.tar.bz2 | |
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.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/include/arch/windows/AndroidConfig.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h index 346ba89..e7eb837 100644 --- a/core/combo/include/arch/windows/AndroidConfig.h +++ b/core/combo/include/arch/windows/AndroidConfig.h @@ -58,19 +58,19 @@ /* TODO: replace references to this. */ #define HAVE_WIN32_IPC +#ifdef __CYGWIN__ +#error "CYGWIN is unsupported for platform builds" +#endif + /* * Define this if you build against MSVCRT.DLL */ -#ifndef __CYGWIN__ -# define HAVE_MS_C_RUNTIME -#endif +#define HAVE_MS_C_RUNTIME /* * Define this if we want to use WinSock. */ -#ifndef __CYGWIN__ #define HAVE_WINSOCK -#endif /* * We need to choose between 32-bit and 64-bit off_t. All of our code should @@ -95,16 +95,6 @@ #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 */ #ifdef USE_MINGW |