diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dln.c | 8 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | regex.h | 2 |
4 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Thu Jun 8 00:31:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp> + + * regex.h: export re_mbctab properly on cygwin. + + * dln.c: use dlopen instead of LoadLibrary on cygwin. + Mon Jun 5 00:18:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp> * bignum.c: avoid conflict with USHORT on mingw32. @@ -71,7 +71,7 @@ char *getenv(); int eaccess(); -#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(__CYGWIN32__) && !defined(_AIX) +#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) /* dynamic load with dlopen() */ # define USE_DLN_DLOPEN #endif @@ -1103,7 +1103,7 @@ dln_sym(name) #endif -#ifdef _WIN32 +#if defined _WIN32 && !defined __CYGWIN__ #include <windows.h> #endif @@ -1135,7 +1135,7 @@ dln_strerror() return (char*)dlerror(); #endif -#ifdef _WIN32 +#if defined _WIN32 && !defined __CYGWIN__ static char message[1024]; int error = GetLastError(); char *p = message; @@ -1210,7 +1210,7 @@ void dln_load(file) const char *file; { -#ifdef _WIN32 +#if defined _WIN32 && !defined __CYGWIN__ HINSTANCE handle; char winfile[MAXPATHLEN]; void (*init_fct)(); @@ -2167,7 +2167,7 @@ Init_File() rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1); rb_define_singleton_method(rb_cFile, "join", rb_file_s_join, -2); -#ifdef DOSISH +#if defined DOSISH && !defined __CYGWIN__ rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_str_new2("\\")); #else rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil); @@ -90,7 +90,7 @@ #define MBCTYPE_SJIS 2 #define MBCTYPE_UTF8 3 -#if defined IMPORT +#if defined IMPORT || defined USEIMPORTLIB extern __declspec(dllimport) #elif defined EXPORT extern __declspec(dllexport) |