From e91baf5634c419247a176f60e399a9446ff2ccf7 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sun, 18 Oct 2015 02:08:56 +0000 Subject: * dln.c: simplify #ifdef. _WIN32 and __CYGWIN__ are exclusive. see include/ruby/defines.h * gc.c: ditto. * ext/sdbm/_sdbm.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ dln.c | 6 +++--- ext/sdbm/_sdbm.c | 4 ++-- gc.c | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebeaf27539..1ce6d0f9bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Oct 18 10:54:52 2015 KOSAKI Motohiro + + * dln.c: simplify #ifdef. _WIN32 and __CYGWIN__ are exclusive. + see include/ruby/defines.h + * gc.c: ditto. + * ext/sdbm/_sdbm.c: ditto. + Sun Oct 18 10:42:19 2015 KOSAKI Motohiro * ruby.c (open_load_file): add a comment. diff --git a/dln.c b/dln.c index e5269ca441..55fe01239c 100644 --- a/dln.c +++ b/dln.c @@ -1117,12 +1117,12 @@ dln_sym(const char *name) #endif #endif -#if defined _WIN32 && !defined __CYGWIN__ +#ifdef _WIN32 #include #include #endif -#if defined _WIN32 && !defined __CYGWIN__ +#ifdef _WIN32 static const char * dln_strerror(char *message, size_t size) { @@ -1254,7 +1254,7 @@ dln_load(const char *file) #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error)) #endif -#if defined _WIN32 && !defined __CYGWIN__ +#if defined _WIN32 HINSTANCE handle; WCHAR *winfile; char message[1024]; diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index b9ee6c3972..9ff0e7959a 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -372,7 +372,7 @@ makroom(register DBM *db, long int hash, int need) { long newp; char twin[PBLKSIZ]; -#if defined _WIN32 && !defined __CYGWIN__ +#if defined _WIN32 char zer[PBLKSIZ]; long oldtail; #endif @@ -399,7 +399,7 @@ makroom(register DBM *db, long int hash, int need) * here, as sdbm_store will do so, after it inserts the incoming pair. */ -#if defined _WIN32 && !defined __CYGWIN__ +#if defined _WIN32 /* * Fill hole with 0 if made it. * (hole is NOT read as 0) diff --git a/gc.c b/gc.c index 4f2f781123..42a5a64e2f 100644 --- a/gc.c +++ b/gc.c @@ -7419,7 +7419,7 @@ aligned_malloc(size_t alignment, size_t size) #if defined __MINGW32__ res = __mingw_aligned_malloc(size, alignment); -#elif defined _WIN32 && !defined __CYGWIN__ +#elif defined _WIN32 void *_aligned_malloc(size_t, size_t); res = _aligned_malloc(size, alignment); #elif defined(HAVE_POSIX_MEMALIGN) @@ -7453,7 +7453,7 @@ aligned_free(void *ptr) { #if defined __MINGW32__ __mingw_aligned_free(ptr); -#elif defined _WIN32 && !defined __CYGWIN__ +#elif defined _WIN32 _aligned_free(ptr); #elif defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN) free(ptr); -- cgit v1.2.3