Bug 476996: Updated comments so that either they don't mention "Mac" (which
authorwtc%google.com
Wed, 06 May 2009 22:50:53 +0000
changeset 4099 cb4e53ac9dd002d75f2bf5d552d128374998e2ea
parent 4098 39bae99aadfd2436bebc5d257825b1b21230efbf
child 4100 5f4d53238493282ec3835ea9f4b229fc5ab4400e
push idunknown
push userunknown
push dateunknown
bugs476996
Bug 476996: Updated comments so that either they don't mention "Mac" (which meant Mac OS Classic) or they say "Mac OS Classic". r=nelson. Modified Files: prinet.h prlink.h prtime.c
pr/include/prinet.h
pr/include/prlink.h
pr/src/misc/prtime.c
--- a/pr/include/prinet.h
+++ b/pr/include/prinet.h
@@ -37,18 +37,17 @@
 
 /*
  * File:		prinet.h
  * Description:
  *     Header file used to find the system header files for socket support[1].
  *     This file serves the following purposes:
  *     - A cross-platform, "get-everything" socket header file.  On
  *       Unix, socket support is scattered in several header files,
- *       while Windows and Mac have a "get-everything" socket header
- *       file[2].
+ *       while Windows has a "get-everything" socket header file[2].
  *     - NSPR needs the following macro definitions and function
  *       prototype declarations from these header files:
  *           AF_INET
  *           INADDR_ANY, INADDR_LOOPBACK, INADDR_BROADCAST
  *           ntohl(), ntohs(), htonl(), ntons().
  *       NSPR does not define its own versions of these macros and
  *       functions.  It simply uses the native versions, which have
  *       the same names on all supported platforms.
--- a/pr/include/prlink.h
+++ b/pr/include/prlink.h
@@ -102,40 +102,40 @@ NSPR_API(void) PR_FreeLibraryName(char *
 **
 ** This increments the reference count of the library.
 */
 NSPR_API(PRLibrary*) PR_LoadLibrary(const char *name);
 
 /*
 ** Each operating system has its preferred way of specifying
 ** a file in the file system.  Most operating systems use
-** a pathname.  Mac OS, on the other hand, uses the FSSpec
+** a pathname.  Mac OS Classic, on the other hand, uses the FSSpec
 ** structure to specify a file. PRLibSpec allows NSPR clients
 ** to use the type of file specification that is most efficient
 ** for a particular platform.
 **
-** On some operating systems such as Mac OS, a shared library may
-** contain code fragments that can be individually loaded.
+** On some operating systems such as Mac OS Classic, a shared library
+** may contain code fragments that can be individually loaded.
 ** PRLibSpec also allows NSPR clients to identify a code fragment
 ** in a library, if code fragments are supported by the OS.
 ** A code fragment can be specified by name or by an integer index.
 **
 ** Right now PRLibSpec supports four types of library specification:
 ** a pathname in the native character encoding, a Mac code fragment
 ** by name, a Mac code fragment by index, and a UTF-16 pathname.
 */
 
 typedef enum PRLibSpecType {
     PR_LibSpec_Pathname,
     PR_LibSpec_MacNamedFragment,   /* obsolete (for Mac OS Classic) */
     PR_LibSpec_MacIndexedFragment, /* obsolete (for Mac OS Classic) */
     PR_LibSpec_PathnameU           /* supported only on Win32 */ 
 } PRLibSpecType;
 
-struct FSSpec; /* Mac OS FSSpec */
+struct FSSpec; /* Mac OS Classic FSSpec */
 
 typedef struct PRLibSpec {
     PRLibSpecType type;
     union {
         /* if type is PR_LibSpec_Pathname */
         const char *pathname;
 
         /* if type is PR_LibSpec_MacNamedFragment */
--- a/pr/src/misc/prtime.c
+++ b/pr/src/misc/prtime.c
@@ -495,18 +495,18 @@ PR_NormalizeTime(PRExplodedTime *time, P
 /*
  *-------------------------------------------------------------------------
  *
  * PR_LocalTimeParameters --
  * 
  *     returns the time parameters for the local time zone
  *
  *     The following uses localtime() from the standard C library.
- *     (time.h)  This is our fallback implementation.  Unix and PC
- *     use this version.  Mac has its own machine-dependent
+ *     (time.h)  This is our fallback implementation.  Unix, PC, and BeOS
+ *     use this version.  A platform may have its own machine-dependent
  *     implementation of this function.
  *
  *-------------------------------------------------------------------------
  */
 
 #if defined(HAVE_INT_LOCALTIME_R)
 
 /*
@@ -741,17 +741,17 @@ PR_LocalTimeParameters(const PRExplodedT
             retVal.tp_gmt_offset = offsetNew - 3600;
             retVal.tp_dst_offset = 3600;
         }
     }
     
     return retVal;
 }
 
-#endif    /* defined(XP_UNIX) !! defined(XP_PC) */
+#endif    /* defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS) */
 
 /*
  *------------------------------------------------------------------------
  *
  * PR_USPacificTimeParameters --
  *
  *     The time parameters function for the US Pacific Time Zone.
  *