Included some new header files, so that building with 'require function prototypes' works better. r=sfraser

5 files changed, 26 insertions, 15 deletions

diff --git a/pr/src/md/mac/macio.c b/pr/src/md/mac/macio.c
index 997f0ccf..2c2d778f 100644
--- a/pr/src/md/mac/macio.c
+++ b/pr/src/md/mac/macio.c
@@ -16,19 +16,28 @@
  * Reserved.
  */
 
+#include <string.h>
+
 #include <Types.h>
 #include <Files.h>
+#include <Devices.h>
 #include <Folders.h>
 #include <Errors.h>
+#include <Resources.h>
+#include <Processes.h>
+#include <TextUtils.h>
 
 #include <fcntl.h>
 
+#include "FullPath.h"		/* MoreFiles */
+
 #include "primpl.h"
 #include "MacErrorHandling.h"
+#include "mdmac.h"
+
+#include "macio.h"
 
 /* forward declarations */
-OSErr ConvertUnixPathToMacPath(const char *, char **);
-OSErr ConvertUnixPathToFSSpec(const char *unixPath, FSSpec *fileSpec);
 extern unsigned long gJanuaryFirst1970Seconds;
 
 extern void WaitOnThisThread(PRThread *thread, PRIntervalTime timeout);
@@ -256,11 +265,11 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
 			if ( bytes > 20480L )
 			{
 	   			me->io_pending = PR_TRUE; /* Only mark thread io pending in async call */
-				(void) PBReadAsync(&pbAsync);
+				(void) PBReadAsync(&pbAsync.pb);
 			}
 			else
 			{
-				(void) PBReadSync(&pbAsync);
+				(void) PBReadSync(&pbAsync.pb);
 				/*
 				** This is probbaly redundant but want to make sure we indicate the read
 				** is complete so we don't wander off into the Sargasso Sea of Mac
@@ -273,7 +282,7 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
 		{
 			/* writes are currently always async so mark thread io pending */
 	   		me->io_pending = PR_TRUE;
-			(void) PBWriteAsync(&pbAsync);
+			(void) PBWriteAsync(&pbAsync.pb);
 		}
 		
 		/* See if the i/o call is still pending before we actually yield */
@@ -1106,8 +1115,6 @@ exit:
 }
 
 
-#include <Processes.h>
-
 static ProcessInfoRec gNavigatorProcInfo;
 static FSSpec gGutsFolder;
 static FSSpec gNetscapeFolder;
diff --git a/pr/src/md/mac/macsockotpt.c b/pr/src/md/mac/macsockotpt.c
index dd9f5ad7..ab6409bc 100644
--- a/pr/src/md/mac/macsockotpt.c
+++ b/pr/src/md/mac/macsockotpt.c
@@ -19,8 +19,11 @@
 /* This turns on UNIX style errors in OT 1.1 headers */
 #define OTUNIXERRORS 1
 
+#include <string.h>
+
 #include <Gestalt.h>
 #include <OpenTransport.h>
+#include <OSUtils.h>
 
 #define GESTALT_OPEN_TPT_PRESENT        gestaltOpenTptPresentMask
 #define GESTALT_OPEN_TPT_TCP_PRESENT    gestaltOpenTptTCPPresentMask
@@ -534,7 +537,7 @@ TryAgain:
 
 ErrorExit:
     if ((err == kOTNoAddressErr) && (++retryCount <= 4)) {
-        long finalTicks;
+        unsigned long finalTicks;
     
         Delay(100,&finalTicks);
         goto TryAgain;
diff --git a/pr/src/md/mac/macthr.c b/pr/src/md/mac/macthr.c
index 501cf629..341e1132 100644
--- a/pr/src/md/mac/macthr.c
+++ b/pr/src/md/mac/macthr.c
@@ -18,6 +18,8 @@
 
 #include "primpl.h"
 
+#include <string.h>
+
 #include <Types.h>
 #include <Timer.h>
 #include <OSUtils.h>
diff --git a/pr/src/md/mac/mactime.c b/pr/src/md/mac/mactime.c
index 9297c130..f0c27258 100644
--- a/pr/src/md/mac/mactime.c
+++ b/pr/src/md/mac/mactime.c
@@ -17,10 +17,12 @@
  */
 
 #include <OSUtils.h>
-#include <time.h>
+#include <Timer.h>
 
 #include "primpl.h"
 
+#include "mactime.h"
+
 PR_IMPLEMENT(UnsignedWide) dstLocalBaseMicroseconds;
 PR_IMPLEMENT(unsigned long) gJanuaryFirst1970Seconds;
 
diff --git a/pr/src/md/mac/mdmac.c b/pr/src/md/mac/mdmac.c
index 7f69191e..57feb012 100644
--- a/pr/src/md/mac/mdmac.c
+++ b/pr/src/md/mac/mdmac.c
@@ -40,21 +40,18 @@
 #include "primpl.h"
 #include "prgc.h"
 
+#include "mactime.h"
 
-#define UNIMPLEMENTED_ROUTINE			\
-	DebugStr("\pNot Implemented Yet");	\
-	return 0;
+#include "mdmac.h"
 
 //
 // Local routines
 //
-void PStrFromCStr(const char *, Str255);
 unsigned char GarbageCollectorCacheFlusher(PRUint32 size);
 
 extern PRThread *gPrimaryThread;
 
 
-
 //##############################################################################
 //##############################################################################
 #pragma mark -
@@ -375,7 +372,7 @@ void CleanupTermProc(void)
 //	be truncated to fit into an Str255 if necessary.
 //  If the C String pointer is NULL, the pascal string's length is set to zero
 //
-extern void 
+void 
 PStrFromCStr(const char* src, Str255 dst)
 {
 	short 	length  = 0;