summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-07 15:49:37 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-07 15:49:37 +0000
commiteb4c6c241d2032ac858c481b35de72dee28bad74 (patch)
treef484706dbbe24fd9cf7f4ea64a974328a291ea78
parent0dedfa849c885b52745e46ec0620cf01a1533fbc (diff)
2000-06-08
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--dln.c8
-rw-r--r--file.c2
-rw-r--r--regex.h2
4 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b31aaf0bc5d..fdc7bfd67d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/dln.c b/dln.c
index 90dcc9042eb..c98be1b236d 100644
--- a/dln.c
+++ b/dln.c
@@ -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)();
diff --git a/file.c b/file.c
index 6d99c3016d8..816277049dc 100644
--- a/file.c
+++ b/file.c
@@ -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);
diff --git a/regex.h b/regex.h
index 69c7daa9021..fafd7a5549f 100644
--- a/regex.h
+++ b/regex.h
@@ -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)