diff --git a/c/xlib/init.c b/c/xlib/init.c index 8e638ed..947b9b4 100644 --- a/c/xlib/init.c +++ b/c/xlib/init.c @@ -1,10 +1,11 @@ #include "xlib.h" +#include "scheme48.h" -static s48_value P_Xlib_Release_4_Or_Laterp () { +s48_value scx_Xlib_Release_4_Or_Later () { return S48_TRUE; } -static s48_value P_Xlib_Release_5_Or_Laterp () { +s48_value scx_Xlib_Release_5_Or_Later () { #ifdef XLIB_RELEASE_5_OR_LATER return S48_TRUE; #else @@ -12,7 +13,7 @@ static s48_value P_Xlib_Release_5_Or_Laterp () { #endif } -static s48_value P_Xlib_Release_6_Or_Laterp () { +s48_value scx_Xlib_Release_6_Or_Later () { #ifdef XLIB_RELEASE_6_OR_LATER return S48_TRUE; #else @@ -20,18 +21,16 @@ static s48_value P_Xlib_Release_6_Or_Laterp () { #endif } -elk_init_xlib_init () { - Define_Primitive (P_Xlib_Release_4_Or_Laterp, - "xlib-release-4-or-later?", 0, 0, EVAL); - Define_Primitive (P_Xlib_Release_5_Or_Laterp, - "xlib-release-5-or-later?", 0, 0, EVAL); - Define_Primitive (P_Xlib_Release_6_Or_Laterp, - "xlib-release-6-or-later?", 0, 0, EVAL); - P_Provide (Intern ("xlib.o")); + +void scx_init_init(void) { + S48_EXPORT_FUNCTION(scx_Xlib_Release_4_Or_Later); + S48_EXPORT_FUNCTION(scx_Xlib_Release_5_Or_Later); + S48_EXPORT_FUNCTION(scx_Xlib_Release_6_Or_Later); } -#if defined(XLIB_RELEASE_5_OR_LATER) && (defined(sun) || defined(__sun__)) &&\ - defined(__svr4__) + +//#if defined(XLIB_RELEASE_5_OR_LATER) && (defined(sun) || defined(__sun__)) &&\ +// defined(__svr4__) /* * Stub interface to dynamic linker routines * that SunOS uses but didn't ship with 4.1. @@ -40,11 +39,7 @@ elk_init_xlib_init () { * load some routines using the dlsym interface, described in dlsym(3x). * Unfortunately SunOS 4.1 does not include the necessary library, libdl. */ - -void *dlopen() { return 0; } - -void *dlsym() { return 0; } - -int dlclose() { return -1; } - -#endif +//void *dlopen() { return 0; } +//void *dlsym() { return 0; } +//int dlclose() { return -1; } +//#endif