Skip to content

Commit f3bdfcc

Browse files
nobunobu
committed
* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
 RUBY_EXPORT to export symbols. * defines.h: use RUBY_EXTERN instead of EXTERN. * intern.h, re.h, ruby.h, rubysig.h: ditto. * win32/win32.h: remove EXTERN definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 72dfee9 commit f3bdfcc

File tree

10 files changed

+121
-103
lines changed

10 files changed

+121
-103
lines changed

‎ChangeLog

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
Tue Mar 04 23:12:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
2+
3+
* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
4+
RUBY_EXPORT to export symbols.
5+
6+
* defines.h: use RUBY_EXTERN instead of EXTERN.
7+
8+
* intern.h, re.h, ruby.h, rubysig.h: ditto.
9+
10+
* win32/win32.h: remove EXTERN definition.
11+
12+
Mon Mar 03 20:42:51 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
13+
14+
* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
15+
RUBY_EXPORT to export symbols.
16+
17+
* defines.h: use RUBY_EXTERN instead of EXTERN.
18+
19+
* intern.h, re.h, ruby.h, rubysig.h: ditto.
20+
21+
* win32/win32.h: remove EXTERN definition.
22+
123
Tue Mar 4 17:54:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
224

325
* array.c (rb_ary_aref): give warning if index is a symbol.

‎bcc32/Makefile.sub

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ MISSING = acosh.obj crypt.obj win32.obj
108108
STACK = 0x2000000
109109
!endif
110110

111-
XCFLAGS =
111+
XCFLAGS = -DRUBY_EXPORT
112112

113113
ARFLAGS = /a
114114
LD = ilink32 -q -Gn
@@ -341,7 +341,7 @@ s,@OBJEXT@,obj,;t t
341341
s,@XLDFLAGS@,$(XLDFLAGS),;t t
342342
s,@DLDFLAGS@,$(DLDFLAGS),;t t
343343
s,@STATIC@,$(STATIC),;t t
344-
s,@CCDLFLAGS@,-DIMPORT,;t t
344+
s,@CCDLFLAGS@,,;t t
345345
s,@LDSHARED@,$(LDSHARED),;t t
346346
s,@DLEXT@,so,;t t
347347
s,@DLEXT2@,dll,;t t

‎configure.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,15 +1169,16 @@ case "$target_os" in
11691169
cygwin*)
11701170
RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
11711171
AC_LIBOBJ([strftime])
1172-
CCDLFLAGS=-DUSEIMPORTLIB ;;
1172+
;;
11731173
mingw*)
11741174
RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
11751175
AC_LIBOBJ([win32])
11761176
COMMON_LIBS=m
11771177
COMMON_MACROS="WIN32_LEAN_AND_MEAN="
11781178
COMMON_HEADERS="windows.h winsock.h"
1179-
CCDLFLAGS=-DIMPORT ;;
1179+
;;
11801180
esac
1181+
XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
11811182
if test x"$enable_shared" = xyes; then
11821183
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
11831184
LIBRUBY_DLDFLAGS='-Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)'

‎defines.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,19 @@ void xfree _((void*));
124124
#include "vms/vms.h"
125125
#endif
126126

127-
#if defined __CYGWIN__
128-
# undef EXTERN
129-
# if defined USEIMPORTLIB
130-
# define EXTERN extern __declspec(dllimport)
131-
# else
132-
# define EXTERN extern __declspec(dllexport)
127+
#undef RUBY_EXTERN
128+
#if defined __CYGWIN__ || defined _WIN32
129+
# ifndef RUBY_EXPORT
130+
# define RUBY_EXTERN extern __declspec(dllimport)
133131
# endif
134132
#endif
135133

134+
#ifndef RUBY_EXTERN
135+
#define RUBY_EXTERN extern
136+
#endif
137+
136138
#ifndef EXTERN
137-
#define EXTERN extern
139+
#define EXTERN RUBY_EXTERN /* deprecated */
138140
#endif
139141

140142
#if defined(sparc) || defined(__sparc__)

‎intern.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ VALUE rb_singleton_class _((VALUE));
124124
int rb_cmpint _((VALUE));
125125
/* enum.c */
126126
/* error.c */
127-
EXTERN int ruby_nerrs;
127+
RUBY_EXTERN int ruby_nerrs;
128128
VALUE rb_exc_new _((VALUE, const char*, long));
129129
VALUE rb_exc_new2 _((VALUE, const char*));
130130
VALUE rb_exc_new3 _((VALUE, VALUE));
@@ -137,7 +137,7 @@ NORETURN(void rb_load_fail _((char*)));
137137
NORETURN(void rb_error_frozen _((char*)));
138138
void rb_check_frozen _((VALUE));
139139
/* eval.c */
140-
EXTERN struct RNode *ruby_current_node;
140+
RUBY_EXTERN struct RNode *ruby_current_node;
141141
void ruby_set_current_source _((void));
142142
NORETURN(void rb_exc_raise _((VALUE)));
143143
NORETURN(void rb_exc_fatal _((VALUE)));
@@ -244,11 +244,11 @@ VALUE rb_hash_delete _((VALUE,VALUE));
244244
int rb_path_check _((char*));
245245
int rb_env_path_tainted _((void));
246246
/* io.c */
247-
EXTERN VALUE rb_fs;
248-
EXTERN VALUE rb_output_fs;
249-
EXTERN VALUE rb_rs;
250-
EXTERN VALUE rb_default_rs;
251-
EXTERN VALUE rb_output_rs;
247+
RUBY_EXTERN VALUE rb_fs;
248+
RUBY_EXTERN VALUE rb_output_fs;
249+
RUBY_EXTERN VALUE rb_rs;
250+
RUBY_EXTERN VALUE rb_default_rs;
251+
RUBY_EXTERN VALUE rb_output_rs;
252252
VALUE rb_io_write _((VALUE, VALUE));
253253
VALUE rb_io_gets _((VALUE));
254254
VALUE rb_io_getc _((VALUE));
@@ -299,8 +299,8 @@ VALUE rb_Array _((VALUE));
299299
double rb_cstr_to_dbl _((const char*, int));
300300
double rb_str_to_dbl _((VALUE, int));
301301
/* parse.y */
302-
EXTERN int ruby_sourceline;
303-
EXTERN char *ruby_sourcefile;
302+
RUBY_EXTERN int ruby_sourceline;
303+
RUBY_EXTERN char *ruby_sourcefile;
304304
int ruby_yyparse _((void));
305305
ID rb_id_attrset _((ID));
306306
void rb_parser_append_print _((void));
@@ -344,8 +344,8 @@ int rb_reg_options _((VALUE));
344344
void rb_set_kcode _((const char*));
345345
const char* rb_get_kcode _((void));
346346
/* ruby.c */
347-
EXTERN VALUE rb_argv;
348-
EXTERN VALUE rb_argv0;
347+
RUBY_EXTERN VALUE rb_argv;
348+
RUBY_EXTERN VALUE rb_argv0;
349349
void rb_load_file _((char*));
350350
void ruby_script _((char*));
351351
void ruby_prog_init _((void));

‎re.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ long rb_reg_adjust_startpos _((VALUE, VALUE, long, long));
3535
void rb_match_busy _((VALUE));
3636
VALUE rb_reg_quote _((VALUE));
3737

38-
EXTERN int ruby_ignorecase;
38+
RUBY_EXTERN int ruby_ignorecase;
3939

4040
int rb_reg_mbclen2 _((unsigned int, VALUE));
4141
#define mbclen2(c,re) rb_reg_mbclen2((c),(re))

‎ruby.h

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ void rb_check_safe_str _((VALUE));
225225
#define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
226226

227227
void rb_secure _((int));
228-
EXTERN int ruby_safe_level;
228+
RUBY_EXTERN int ruby_safe_level;
229229
#define rb_safe_level() (ruby_safe_level)
230230
void rb_set_safe_level _((int));
231231

@@ -511,7 +511,7 @@ VALUE rb_iv_set _((VALUE, const char*, VALUE));
511511

512512
VALUE rb_equal _((VALUE,VALUE));
513513

514-
EXTERN VALUE ruby_verbose, ruby_debug;
514+
RUBY_EXTERN VALUE ruby_verbose, ruby_debug;
515515

516516
NORETURN(void rb_raise __((VALUE, const char*, ...)));
517517
NORETURN(void rb_fatal __((const char*, ...)));
@@ -541,69 +541,69 @@ void ruby_init _((void));
541541
void ruby_options _((int, char**));
542542
void ruby_run _((void));
543543

544-
EXTERN VALUE rb_mKernel;
545-
EXTERN VALUE rb_mComparable;
546-
EXTERN VALUE rb_mEnumerable;
547-
EXTERN VALUE rb_mPrecision;
548-
EXTERN VALUE rb_mErrno;
549-
EXTERN VALUE rb_mFileTest;
550-
EXTERN VALUE rb_mGC;
551-
EXTERN VALUE rb_mMath;
552-
EXTERN VALUE rb_mProcess;
553-
554-
EXTERN VALUE rb_cObject;
555-
EXTERN VALUE rb_cArray;
556-
EXTERN VALUE rb_cBignum;
557-
EXTERN VALUE rb_cClass;
558-
EXTERN VALUE rb_cDir;
559-
EXTERN VALUE rb_cData;
560-
EXTERN VALUE rb_cFalseClass;
561-
EXTERN VALUE rb_cFile;
562-
EXTERN VALUE rb_cFixnum;
563-
EXTERN VALUE rb_cFloat;
564-
EXTERN VALUE rb_cHash;
565-
EXTERN VALUE rb_cInteger;
566-
EXTERN VALUE rb_cIO;
567-
EXTERN VALUE rb_cModule;
568-
EXTERN VALUE rb_cNilClass;
569-
EXTERN VALUE rb_cNumeric;
570-
EXTERN VALUE rb_cProc;
571-
EXTERN VALUE rb_cRange;
572-
EXTERN VALUE rb_cRegexp;
573-
EXTERN VALUE rb_cString;
574-
EXTERN VALUE rb_cSymbol;
575-
EXTERN VALUE rb_cThread;
576-
EXTERN VALUE rb_cTime;
577-
EXTERN VALUE rb_cTrueClass;
578-
EXTERN VALUE rb_cStruct;
579-
580-
EXTERN VALUE rb_eException;
581-
EXTERN VALUE rb_eStandardError;
582-
EXTERN VALUE rb_eSystemExit;
583-
EXTERN VALUE rb_eInterrupt;
584-
EXTERN VALUE rb_eSignal;
585-
EXTERN VALUE rb_eFatal;
586-
EXTERN VALUE rb_eArgError;
587-
EXTERN VALUE rb_eEOFError;
588-
EXTERN VALUE rb_eIndexError;
589-
EXTERN VALUE rb_eRangeError;
590-
EXTERN VALUE rb_eIOError;
591-
EXTERN VALUE rb_eRuntimeError;
592-
EXTERN VALUE rb_eSecurityError;
593-
EXTERN VALUE rb_eSystemCallError;
594-
EXTERN VALUE rb_eTypeError;
595-
EXTERN VALUE rb_eZeroDivError;
596-
EXTERN VALUE rb_eNotImpError;
597-
EXTERN VALUE rb_eNoMemError;
598-
EXTERN VALUE rb_eNoMethodError;
599-
EXTERN VALUE rb_eFloatDomainError;
600-
601-
EXTERN VALUE rb_eScriptError;
602-
EXTERN VALUE rb_eNameError;
603-
EXTERN VALUE rb_eSyntaxError;
604-
EXTERN VALUE rb_eLoadError;
605-
606-
EXTERN VALUE rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo;
544+
RUBY_EXTERN VALUE rb_mKernel;
545+
RUBY_EXTERN VALUE rb_mComparable;
546+
RUBY_EXTERN VALUE rb_mEnumerable;
547+
RUBY_EXTERN VALUE rb_mPrecision;
548+
RUBY_EXTERN VALUE rb_mErrno;
549+
RUBY_EXTERN VALUE rb_mFileTest;
550+
RUBY_EXTERN VALUE rb_mGC;
551+
RUBY_EXTERN VALUE rb_mMath;
552+
RUBY_EXTERN VALUE rb_mProcess;
553+
554+
RUBY_EXTERN VALUE rb_cObject;
555+
RUBY_EXTERN VALUE rb_cArray;
556+
RUBY_EXTERN VALUE rb_cBignum;
557+
RUBY_EXTERN VALUE rb_cClass;
558+
RUBY_EXTERN VALUE rb_cDir;
559+
RUBY_EXTERN VALUE rb_cData;
560+
RUBY_EXTERN VALUE rb_cFalseClass;
561+
RUBY_EXTERN VALUE rb_cFile;
562+
RUBY_EXTERN VALUE rb_cFixnum;
563+
RUBY_EXTERN VALUE rb_cFloat;
564+
RUBY_EXTERN VALUE rb_cHash;
565+
RUBY_EXTERN VALUE rb_cInteger;
566+
RUBY_EXTERN VALUE rb_cIO;
567+
RUBY_EXTERN VALUE rb_cModule;
568+
RUBY_EXTERN VALUE rb_cNilClass;
569+
RUBY_EXTERN VALUE rb_cNumeric;
570+
RUBY_EXTERN VALUE rb_cProc;
571+
RUBY_EXTERN VALUE rb_cRange;
572+
RUBY_EXTERN VALUE rb_cRegexp;
573+
RUBY_EXTERN VALUE rb_cString;
574+
RUBY_EXTERN VALUE rb_cSymbol;
575+
RUBY_EXTERN VALUE rb_cThread;
576+
RUBY_EXTERN VALUE rb_cTime;
577+
RUBY_EXTERN VALUE rb_cTrueClass;
578+
RUBY_EXTERN VALUE rb_cStruct;
579+
580+
RUBY_EXTERN VALUE rb_eException;
581+
RUBY_EXTERN VALUE rb_eStandardError;
582+
RUBY_EXTERN VALUE rb_eSystemExit;
583+
RUBY_EXTERN VALUE rb_eInterrupt;
584+
RUBY_EXTERN VALUE rb_eSignal;
585+
RUBY_EXTERN VALUE rb_eFatal;
586+
RUBY_EXTERN VALUE rb_eArgError;
587+
RUBY_EXTERN VALUE rb_eEOFError;
588+
RUBY_EXTERN VALUE rb_eIndexError;
589+
RUBY_EXTERN VALUE rb_eRangeError;
590+
RUBY_EXTERN VALUE rb_eIOError;
591+
RUBY_EXTERN VALUE rb_eRuntimeError;
592+
RUBY_EXTERN VALUE rb_eSecurityError;
593+
RUBY_EXTERN VALUE rb_eSystemCallError;
594+
RUBY_EXTERN VALUE rb_eTypeError;
595+
RUBY_EXTERN VALUE rb_eZeroDivError;
596+
RUBY_EXTERN VALUE rb_eNotImpError;
597+
RUBY_EXTERN VALUE rb_eNoMemError;
598+
RUBY_EXTERN VALUE rb_eNoMethodError;
599+
RUBY_EXTERN VALUE rb_eFloatDomainError;
600+
601+
RUBY_EXTERN VALUE rb_eScriptError;
602+
RUBY_EXTERN VALUE rb_eNameError;
603+
RUBY_EXTERN VALUE rb_eSyntaxError;
604+
RUBY_EXTERN VALUE rb_eLoadError;
605+
606+
RUBY_EXTERN VALUE rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo;
607607

608608
static inline VALUE
609609
#if defined(HAVE_PROTOTYPES)

‎rubysig.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ typedef int rb_atomic_t;
5353
rb_trap_immediate = trap_immediate;\
5454
} while (0)
5555
#endif
56-
EXTERN rb_atomic_t rb_trap_immediate;
56+
RUBY_EXTERN rb_atomic_t rb_trap_immediate;
5757

58-
EXTERN int rb_prohibit_interrupt;
58+
RUBY_EXTERN int rb_prohibit_interrupt;
5959
#define DEFER_INTS (rb_prohibit_interrupt++)
6060
#define ALLOW_INTS do {\
6161
rb_prohibit_interrupt--;\
@@ -65,13 +65,13 @@ EXTERN int rb_prohibit_interrupt;
6565

6666
VALUE rb_with_disable_interrupt _((VALUE(*)(ANYARGS),VALUE));
6767

68-
EXTERN rb_atomic_t rb_trap_pending;
68+
RUBY_EXTERN rb_atomic_t rb_trap_pending;
6969
void rb_trap_restore_mask _((void));
7070

71-
EXTERN int rb_thread_critical;
71+
RUBY_EXTERN int rb_thread_critical;
7272
void rb_thread_schedule _((void));
7373
#if defined(HAVE_SETITIMER) && !defined(__BOW__)
74-
EXTERN int rb_thread_pending;
74+
RUBY_EXTERN int rb_thread_pending;
7575
# define CHECK_INTS do {\
7676
if (!rb_prohibit_interrupt) {\
7777
if (rb_trap_pending) rb_trap_exec();\
@@ -81,7 +81,7 @@ EXTERN int rb_thread_pending;
8181
} while (0)
8282
#else
8383
/* pseudo preemptive thread switching */
84-
EXTERN int rb_thread_tick;
84+
RUBY_EXTERN int rb_thread_tick;
8585
#define THREAD_TICK 500
8686
#define CHECK_INTS do {\
8787
if (!rb_prohibit_interrupt) {\

‎win32/Makefile.sub

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ARFLAGS = -machine:$(MACHINE) -out:
9999
CC = $(CC) -nologo
100100
LD = $(CC)
101101
LDSHARED = $(LD) -LD
102-
XCFLAGS =
102+
XCFLAGS = -DRUBY_EXPORT
103103
LDFLAGS = -link -incremental:no -pdb:none
104104
DLDFLAGS = $(LDFLAGS) -dll
105105
XLDFLAGS = -stack:$(STACK)
@@ -336,7 +336,7 @@ s,@OBJEXT@,obj,;t t
336336
s,@XLDFLAGS@,$(XLDFLAGS),;t t
337337
s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE),;t t
338338
s,@STATIC@,$(STATIC),;t t
339-
s,@CCDLFLAGS@,-DIMPORT,;t t
339+
s,@CCDLFLAGS@,,;t t
340340
s,@LDSHARED@,$(LDSHARED),;t t
341341
s,@DLEXT@,so,;t t
342342
s,@DLEXT2@,dll,;t t

‎win32/win32.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
*
1010
*/
1111

12-
#undef EXTERN
13-
#if defined(IMPORT)
14-
#define EXTERN extern __declspec(dllimport)
15-
#elif defined(EXPORT)
16-
#define EXTERN extern __declspec(dllexport)
17-
#endif
18-
1912
//
2013
// Definitions for NT port of Perl
2114
//

0 commit comments

Comments
 (0)