From 9e8fbafe16d50bafedb2124cd48b5d345bac2e5d Mon Sep 17 00:00:00 2001
From: "dveditz%netscape.com"
 <dveditz%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 7 Sep 1999 22:03:53 +0000
Subject: [PATCH] fixing mac bustage

git-svn-id: svn://10.0.0.236/trunk@46230 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libjar/nsZipArchive.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mozilla/modules/libjar/nsZipArchive.cpp b/mozilla/modules/libjar/nsZipArchive.cpp
index 02f7dc31441..f3661d9c993 100644
--- a/mozilla/modules/libjar/nsZipArchive.cpp
+++ b/mozilla/modules/libjar/nsZipArchive.cpp
@@ -40,21 +40,24 @@
 #include "xp_regexp.h"
 #define ZFILE_CREATE    PR_WRONLY | PR_CREATE_FILE
 #define READTYPE  PRInt32
+#include "zlib.h"
 
 #else
 
 #ifdef WIN32
 #include "windows.h"
 #endif
-#include "zipstub.h"
+
 #undef MOZILLA_CLIENT       // undoes prtypes damage in zlib.h
 #define ZFILE_CREATE  "wb"
 #define READTYPE  PRUint32
+#include "zlib.h"
+#undef PR_PUBLIC_API
+#include "zipstub.h"
 
 #endif /* STANDALONE */
 
 
-#include "zlib.h"
 #include "zipfile.h"
 #include "zipstruct.h"
 #include "nsZipArchive.h"