mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
stubs.c: library name strings
* ext/tk/stubs.c (ruby_open_tcl_dll, ruby_open_tk_dll): make library names by string literal concatenation at compilation time, not by sprintf() at runtime. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
13e47e81d9
commit
4240685237
1 changed files with 6 additions and 8 deletions
|
@ -83,8 +83,8 @@ _nativethread_consistency_check(ip)
|
||||||
# define DL_SYM GetProcAddress
|
# define DL_SYM GetProcAddress
|
||||||
# define TCL_INDEX 4
|
# define TCL_INDEX 4
|
||||||
# define TK_INDEX 3
|
# define TK_INDEX 3
|
||||||
# define TCL_NAME "tcl89%s"
|
# define TCL_NAME "tcl89"
|
||||||
# define TK_NAME "tk89%s"
|
# define TK_NAME "tk89"
|
||||||
# undef DLEXT
|
# undef DLEXT
|
||||||
# define DLEXT ".dll"
|
# define DLEXT ".dll"
|
||||||
#elif defined HAVE_DLOPEN
|
#elif defined HAVE_DLOPEN
|
||||||
|
@ -94,8 +94,8 @@ _nativethread_consistency_check(ip)
|
||||||
# define DL_SYM dlsym
|
# define DL_SYM dlsym
|
||||||
# define TCL_INDEX 8
|
# define TCL_INDEX 8
|
||||||
# define TK_INDEX 7
|
# define TK_INDEX 7
|
||||||
# define TCL_NAME "libtcl8.9%s"
|
# define TCL_NAME "libtcl8.9"
|
||||||
# define TK_NAME "libtk8.9%s"
|
# define TK_NAME "libtk8.9"
|
||||||
# ifdef __APPLE__
|
# ifdef __APPLE__
|
||||||
# undef DLEXT
|
# undef DLEXT
|
||||||
# define DLEXT ".dylib"
|
# define DLEXT ".dylib"
|
||||||
|
@ -116,7 +116,6 @@ ruby_open_tcl_dll(appname)
|
||||||
void (*p_Tcl_FindExecutable)(const char *);
|
void (*p_Tcl_FindExecutable)(const char *);
|
||||||
int n;
|
int n;
|
||||||
char *ruby_tcl_dll = 0;
|
char *ruby_tcl_dll = 0;
|
||||||
char tcl_name[20];
|
|
||||||
|
|
||||||
if (tcl_dll) return TCLTK_STUBS_OK;
|
if (tcl_dll) return TCLTK_STUBS_OK;
|
||||||
|
|
||||||
|
@ -127,7 +126,7 @@ ruby_open_tcl_dll(appname)
|
||||||
if (ruby_tcl_dll) {
|
if (ruby_tcl_dll) {
|
||||||
tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
|
tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
|
||||||
} else {
|
} else {
|
||||||
snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT);
|
char tcl_name[] = TCL_NAME DLEXT;
|
||||||
/* examine from 8.9 to 8.1 */
|
/* examine from 8.9 to 8.1 */
|
||||||
for (n = '9'; n > '0'; n--) {
|
for (n = '9'; n > '0'; n--) {
|
||||||
tcl_name[TCL_INDEX] = n;
|
tcl_name[TCL_INDEX] = n;
|
||||||
|
@ -162,7 +161,6 @@ ruby_open_tk_dll()
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
char *ruby_tk_dll = 0;
|
char *ruby_tk_dll = 0;
|
||||||
char tk_name[20];
|
|
||||||
|
|
||||||
if (!tcl_dll) {
|
if (!tcl_dll) {
|
||||||
/* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
|
/* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
|
||||||
|
@ -176,7 +174,7 @@ ruby_open_tk_dll()
|
||||||
if (ruby_tk_dll) {
|
if (ruby_tk_dll) {
|
||||||
tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
|
tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
|
||||||
} else {
|
} else {
|
||||||
snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT);
|
char tk_name[] = TK_NAME DLEXT;
|
||||||
/* examine from 8.9 to 8.1 */
|
/* examine from 8.9 to 8.1 */
|
||||||
for (n = '9'; n > '0'; n--) {
|
for (n = '9'; n > '0'; n--) {
|
||||||
tk_name[TK_INDEX] = n;
|
tk_name[TK_INDEX] = n;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue