Errors.h->MacErrors.h, Types.h->MacTypes.h, r=saari/sr=hyatt. bug# 75653

lib/mac/MoreFiles/DirectoryCopy.c

@@ -19,8 +19,8 @@
 **	descended from Apple Sample Code, but that you've made changes.
 */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Memory.h>
 #include <Files.h>
 #include <Script.h>

lib/mac/MoreFiles/DirectoryCopy.h

@@ -22,7 +22,7 @@
 #ifndef __DIRECTORYCOPY__
 #define __DIRECTORYCOPY__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/FSpCompat.c

@@ -28,8 +28,8 @@
 #define GENERATENODATA 0
 #endif
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <LowMem.h>
 #include <Gestalt.h>
 #include <Resources.h>

lib/mac/MoreFiles/FSpCompat.h

@@ -22,7 +22,7 @@
 #ifndef __FSPCOMPAT__
 #define __FSPCOMPAT__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/FileCopy.c

@@ -19,8 +19,8 @@
 **	descended from Apple Sample Code, but that you've made changes.
 */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Memory.h>
 #include <Files.h>
 

lib/mac/MoreFiles/FileCopy.h

@@ -22,7 +22,7 @@
 #ifndef __FILECOPY__
 #define __FILECOPY__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/FullPath.c

@@ -19,8 +19,8 @@
 **	descended from Apple Sample Code, but that you've made changes.
 */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Memory.h>
 #include <Files.h>
 #include <TextUtils.h>

lib/mac/MoreFiles/FullPath.h

@@ -22,7 +22,7 @@
 #ifndef __FULLPATH__
 #define __FULLPATH__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/IterateDirectory.c

@@ -16,8 +16,8 @@
 **	library I wrote while in Apple Developer Technical Support
 */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Files.h>
 
 #define	__COMPILINGMOREFILES

lib/mac/MoreFiles/IterateDirectory.h

@@ -19,7 +19,7 @@
 #ifndef __ITERATEDIRECTORY__
 #define __ITERATEDIRECTORY__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/MoreDesktopMgr.c

@@ -28,8 +28,8 @@
  * Netscape.
  */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Memory.h>
 #include <Files.h>
 #include <Resources.h>

lib/mac/MoreFiles/MoreDesktopMgr.h

@@ -26,7 +26,7 @@
 #ifndef __MOREDESKTOPMGR__
 #define __MOREDESKTOPMGR__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/MoreFiles.c

@@ -24,8 +24,8 @@
  * Netscape.
  */
 
-#include <Types.h>
-#include <Errors.h>
+#include <MacTypes.h>
+#include <MacErrors.h>
 #include <Files.h>
 
 #define	__COMPILINGMOREFILES

lib/mac/MoreFiles/MoreFiles.h

@@ -22,7 +22,7 @@
 #ifndef __MOREFILES__
 #define __MOREFILES__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/MoreFilesExtras.c

@@ -24,10 +24,10 @@
  * Netscape.
  */
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Traps.h>
 #include <OSUtils.h>
-#include <Errors.h>
+#include <MacErrors.h>
 #include <Files.h>
 #include <Devices.h>
 #include <Finder.h>

lib/mac/MoreFiles/MoreFilesExtras.h

@@ -22,7 +22,7 @@
 #ifndef __MOREFILESEXTRAS__
 #define __MOREFILESEXTRAS__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"

lib/mac/MoreFiles/MoreFilesSearch.c

@@ -28,10 +28,10 @@
  */
 
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Gestalt.h>
 #include <Timer.h>
-#include <Errors.h>
+#include <MacErrors.h>
 #include <Memory.h>
 #include <Files.h>
 #include <TextUtils.h>

lib/mac/MoreFiles/MoreFilesSearch.h

@@ -30,7 +30,7 @@
 #ifndef __SEARCH__
 #define __SEARCH__
 
-#include <Types.h>
+#include <MacTypes.h>
 #include <Files.h>
 
 #include "Optimization.h"