2000-06-08

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2000-06-07 15:49:37 +00:00
parent 0dedfa849c
commit eb4c6c241d
4 changed files with 12 additions and 6 deletions

View File

@ -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> Mon Jun 5 00:18:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* bignum.c: avoid conflict with USHORT on mingw32. * bignum.c: avoid conflict with USHORT on mingw32.

8
dln.c
View File

@ -71,7 +71,7 @@ char *getenv();
int eaccess(); 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() */ /* dynamic load with dlopen() */
# define USE_DLN_DLOPEN # define USE_DLN_DLOPEN
#endif #endif
@ -1103,7 +1103,7 @@ dln_sym(name)
#endif #endif
#ifdef _WIN32 #if defined _WIN32 && !defined __CYGWIN__
#include <windows.h> #include <windows.h>
#endif #endif
@ -1135,7 +1135,7 @@ dln_strerror()
return (char*)dlerror(); return (char*)dlerror();
#endif #endif
#ifdef _WIN32 #if defined _WIN32 && !defined __CYGWIN__
static char message[1024]; static char message[1024];
int error = GetLastError(); int error = GetLastError();
char *p = message; char *p = message;
@ -1210,7 +1210,7 @@ void
dln_load(file) dln_load(file)
const char *file; const char *file;
{ {
#ifdef _WIN32 #if defined _WIN32 && !defined __CYGWIN__
HINSTANCE handle; HINSTANCE handle;
char winfile[MAXPATHLEN]; char winfile[MAXPATHLEN];
void (*init_fct)(); void (*init_fct)();

2
file.c
View File

@ -2167,7 +2167,7 @@ Init_File()
rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1); rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1);
rb_define_singleton_method(rb_cFile, "join", rb_file_s_join, -2); 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("\\")); rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_str_new2("\\"));
#else #else
rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil); rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);

View File

@ -90,7 +90,7 @@
#define MBCTYPE_SJIS 2 #define MBCTYPE_SJIS 2
#define MBCTYPE_UTF8 3 #define MBCTYPE_UTF8 3
#if defined IMPORT #if defined IMPORT || defined USEIMPORTLIB
extern __declspec(dllimport) extern __declspec(dllimport)
#elif defined EXPORT #elif defined EXPORT
extern __declspec(dllexport) extern __declspec(dllexport)