diff options
| author | wtc%netscape.com <devnull@localhost> | 1998-11-18 23:53:21 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1998-11-18 23:53:21 +0000 |
| commit | 142ae4b81d9795b68c546cb4ea9c4133a26c3d03 (patch) | |
| tree | 8e58e9ca4870f2f1165c58d4d9d3c90be52f3e43 /pr/src/linking | |
| parent | 48728e542f6938af5e328372f0a4b15844124889 (diff) | |
| download | nspr-hg-142ae4b81d9795b68c546cb4ea9c4133a26c3d03.tar.gz | |
NEXT port. Contributed by Balazs Pataki (balazs.pataki@sztaki.hu).
Diffstat (limited to 'pr/src/linking')
| -rw-r--r-- | pr/src/linking/prlink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c index ff06b33d..7516ef0e 100644 --- a/pr/src/linking/prlink.c +++ b/pr/src/linking/prlink.c @@ -32,7 +32,7 @@ #include <dlfcn.h> #elif defined(USE_HPSHL) #include <dl.h> -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) #include <mach-o/dyld.h> #endif @@ -45,7 +45,7 @@ /* * On these platforms, symbols have a leading '_'. */ -#if defined(SUNOS4) || defined(RHAPSODY) || defined(WIN16) +#if defined(SUNOS4) || defined(RHAPSODY) || defined(NEXTSTEP) || defined(WIN16) #define NEED_LEADING_UNDERSCORE #endif @@ -71,7 +71,7 @@ struct PRLibrary { #ifdef XP_UNIX #if defined(USE_HPSHL) shl_t dlh; -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) NSModule dlh; #else void* dlh; @@ -170,7 +170,7 @@ void _PR_InitLinker(void) #elif defined(USE_HPSHL) h = NULL; /* don't abort with this NULL */ -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) h = NULL; /* XXXX toshok */ #else #error no dll strategy @@ -641,7 +641,7 @@ PR_LoadLibrary(const char *name) void *h = dlopen(name, RTLD_LAZY); #elif defined(USE_HPSHL) shl_t h = shl_load(name, BIND_DEFERRED | DYNAMIC_PATH, 0L); -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) NSObjectFileImage ofi; NSModule h = NULL; if (NSCreateObjectFileImageFromFile(name, &ofi) @@ -714,7 +714,7 @@ PR_UnloadLibrary(PRLibrary *lib) result = dlclose(lib->dlh); #elif defined(USE_HPSHL) result = shl_unload(lib->dlh); -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) result = NSUnLinkModule(lib->dlh, FALSE); #else #error Configuration error @@ -827,7 +827,7 @@ pr_FindSymbolInLib(PRLibrary *lm, const char *name) if (shl_findsym(&lm->dlh, name, TYPE_PROCEDURE, &f) == -1) { f = NULL; } -#elif defined(RHAPSODY) +#elif defined(RHAPSODY) || defined(NEXTSTEP) f = NSAddressOfSymbol(NSLookupAndBindSymbol(name)); #endif #endif /* HAVE_DLL */ |