Bugzilla bug #19150: removed prlink_mac.h and the mac-specific NSPRPUB_RELEASE_4_0_BRANCH
authorwtc%netscape.com
Fri, 28 Jan 2000 01:06:00 +0000
branchNSPRPUB_RELEASE_4_0_BRANCH
changeset 1112 360934cd5d06ffb238922a141f8ed95091eaa125
parent 1108 5cdab0dd2bde6a122bf4a4920dd5a5f5c0953dfe
child 1113 2db18c16f5dfcd6510bd2ba53a0971f0c3f990db
push idunknown
push userunknown
push dateunknown
bugs19150
Bugzilla bug #19150: removed prlink_mac.h and the mac-specific PR_LoadIndexedFragment and PR_LoadNamedFragment functions. Modified files: pr/include/MANIFEST, prlink.c Removed file: prlink_mac.h (NSPRPUB_RELEASE_4_0_BRANCH)
pr/include/MANIFEST
pr/include/prlink_mac.h
pr/src/linking/prlink.c
--- a/pr/include/MANIFEST
+++ b/pr/include/MANIFEST
@@ -37,17 +37,15 @@ prshma.h
 prsystem.h
 prthread.h
 prtime.h
 prtrace.h
 prtypes.h
 prvrsion.h
 prwin16.h
 
-prlink_mac.h
-
 obsolete/protypes.h
 obsolete/prsem.h
 obsolete/probslet.h
 
 private/prpriv.h
 private/pprio.h
 private/pprthred.h
deleted file mode 100644
--- a/pr/include/prlink_mac.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- * 
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- * 
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-#ifndef prlink_mac_h___
-#define prlink_mac_h___
-
-#ifdef XP_MAC
-
-#include <Files.h>
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_LoadNamedFragment
-** 
-** Load a code fragment by fragment name from the data fork of the specified file.
-** The fragment name is an internal name which uniquely identifies a code
-** fragment; this call opens the 'cfrg' resource in the file to find the
-** offsets of the named fragment.
-** 
-** If the specified fragment exists, it is loaded and an entry created
-** in the load map (keyed by fragment name).
-** 
-** If fileSpec points to an alias, the alias is resolved by this call.
-*/
-NSPR_API(PRLibrary*) PR_LoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName);
-
-/*
-** PR_LoadIndexedFragment
-** 
-** Load a code fragment by fragment index from the data fork of the specified file
-** (since Mac shared libraries can contain multiple code fragments).
-** This call opens the 'cfrg' resource in the file to find the offsets
-** of the named fragment.
-** 
-** If the specified fragment exists, it is loaded and an entry created
-** in the load map (keyed by fragment name).
-** 
-** If fileSpec points to an alias, the alias is resolved by this call.
-** 
-*/
-NSPR_API(PRLibrary*) PR_LoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragIndex);
-
-PR_END_EXTERN_C
-
-#endif
-
-
-#endif /* prlink_mac_h___ */
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -26,17 +26,16 @@
 
 #ifdef XP_MAC
 #include <CodeFragments.h>
 #include <TextUtils.h>
 #include <Types.h>
 #include <Strings.h>
 #include <Aliases.h>
 
-#include "prlink_mac.h"
 #include "macdll.h"
 #include "mdmac.h"
 #endif
 
 #ifdef XP_UNIX
 #ifdef USE_DLFCN
 #include <dlfcn.h>
 /* Define these on systems that don't have them. */
@@ -802,27 +801,16 @@ PR_FindLibrary(const char *name)
     result = pr_UnlockedFindLibrary(name);
     PR_ExitMonitor(pr_linker_lock);
     return result;
 }
 
 
 #ifdef XP_MAC
 
-PR_IMPLEMENT(PRLibrary*) 
-PR_LoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName)
-{
-    PRLibSpec libSpec;
-
-    libSpec.type = PR_LibSpec_MacNamedFragment;
-    libSpec.value.mac_named_fragment.fsspec = fileSpec;
-    libSpec.value.mac_named_fragment.name = fragmentName;
-    return PR_LoadLibraryWithFlags(libSpec, 0);
-}
-
 static PRLibrary*
 pr_Mac_LoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName)
 {
 	PRLibrary*					newLib = NULL;
 	PRLibrary* 					result;
 	FSSpec							resolvedSpec = *fileSpec;
 	CFragConnectionID		connectionID = 0;
 	Boolean							isFolder, wasAlias;
@@ -870,27 +858,16 @@ unlock:
 		PR_SetError(PR_LOAD_LIBRARY_ERROR, _MD_ERRNO());
 		DLLErrorInternal(_MD_ERRNO());  /* sets error text */
 	}
 	PR_ExitMonitor(pr_linker_lock);
 	return result;
 }
 
 
-PR_EXTERN(PRLibrary*)
-PR_LoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragIndex)
-{
-    PRLibSpec libSpec;
-
-    libSpec.type = PR_LibSpec_MacIndexedFragment;
-    libSpec.value.mac_indexed_fragment.fsspec = fileSpec;
-    libSpec.value.mac_indexed_fragment.index = fragIndex;
-    return PR_LoadLibraryWithFlags(libSpec, 0);
-}
-
 static PRLibrary*
 pr_Mac_LoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragIndex)
 {
 	PRLibrary*					newLib = NULL;
 	PRLibrary* 					result;
 	FSSpec							resolvedSpec = *fileSpec;
 	char*								fragmentName = NULL;
 	UInt32              fragOffset, fragLength;