From 3e1d8aab1731e671b8daf266bbdb99196ff95421 Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 9 Jul 2012 15:52:49 +0000 Subject: * dln.c: Simplify and make consistent an ifdef for Mac OS X. * ext/socket/rubysocket.h: ditto. * ext/tk/stubs.c: ditto. * io.c: ditto. * process.c: ditto. * signal.c: ditto. * vm_dump.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/rubysocket.h | 2 +- ext/tk/stubs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 16403160ec..3b6f51f376 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -139,7 +139,7 @@ struct sockaddr_storage { }; #endif -#if defined __APPLE__ && defined __MACH__ +#ifdef __APPLE__ /* * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN * aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c index dd475c3455..7398a79ae3 100644 --- a/ext/tk/stubs.c +++ b/ext/tk/stubs.c @@ -96,7 +96,7 @@ _nativethread_consistency_check(ip) # define TK_INDEX 7 # define TCL_NAME "libtcl8.9%s" # define TK_NAME "libtk8.9%s" -# if defined(__APPLE__) && defined(__MACH__) /* Mac OS X */ +# ifdef __APPLE__ # undef DLEXT # define DLEXT ".dylib" # endif @@ -329,7 +329,7 @@ ruby_tk_stubs_init(tcl_ip) if (!p_Tk_Init) return NO_Tk_Init; -#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__) && defined(__MACH__) +#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__) /* FIX ME : dirty hack for Mac OS X frameworks. With stubs, fails to find Resource/Script directory of Tk.framework. -- cgit v1.2.3