diff options
| author | beard%netscape.com <devnull@localhost> | 2000-06-20 23:10:00 +0000 |
|---|---|---|
| committer | beard%netscape.com <devnull@localhost> | 2000-06-20 23:10:00 +0000 |
| commit | 0b22141cfbbaa997908b92b5a04997e1be540fb9 (patch) | |
| tree | b4c3693a121447d15ff5b95dde91621dd277c16c | |
| parent | f50d3a2e470c3e734aeb189507d38e29583ab605 (diff) | |
| download | nspr-hg-0b22141cfbbaa997908b92b5a04997e1be540fb9.tar.gz | |
bug #42100, Carbon compatibility. r=gordon, saari, pinkerton, sfraser
| -rw-r--r-- | macbuild/NSPR20PPC.mcp | bin | 97889 -> 153941 bytes | |||
| -rw-r--r-- | macbuild/NSPRConfig.h | 2 | ||||
| -rw-r--r-- | pr/src/linking/prlink.c | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/macbuild/NSPR20PPC.mcp b/macbuild/NSPR20PPC.mcp Binary files differindex fa75d4da..ba5ad553 100644 --- a/macbuild/NSPR20PPC.mcp +++ b/macbuild/NSPR20PPC.mcp diff --git a/macbuild/NSPRConfig.h b/macbuild/NSPRConfig.h index 07a9783f..36f467a5 100644 --- a/macbuild/NSPRConfig.h +++ b/macbuild/NSPRConfig.h @@ -24,4 +24,4 @@ #define FORCE_PR_LOG 1 #define NSPR20 1 #define NSPR_AS_SHARED_LIB - +#define TARGET_CARBON 0 diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c index 929cd7be..142e77c4 100644 --- a/pr/src/linking/prlink.c +++ b/pr/src/linking/prlink.c @@ -544,7 +544,7 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags) } #endif /* WIN32 || WIN16 */ -#if defined(XP_MAC) && GENERATINGCFM +#if defined(XP_MAC) && TARGET_RT_MAC_CFM { OSErr err; Ptr main; @@ -666,10 +666,8 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags) cFileName = &(cMacPath[index + 1]); /* Convert the path and name into Pascal strings */ - strcpy((char*) &pName, cMacPath); - c2pstr((char*) &pName); - strcpy((char*) &fileSpec.name, cFileName); - c2pstr((char*) &fileSpec.name); + PStrFromCStr(cMacPath, pName); + PStrFromCStr(cFileName, fileSpec.name); strcpy(cName, cFileName); PR_DELETE(cMacPath); cMacPath = NULL; @@ -997,7 +995,7 @@ PR_UnloadLibrary(PRLibrary *lib) } #endif /* XP_PC */ -#if defined(XP_MAC) && GENERATINGCFM +#if defined(XP_MAC) && TARGET_RT_MAC_CFM /* Close the connection */ CloseConnection(&(lib->dlh)); #endif |