bringing ASEncoder upt-to-date using new Universal Headers -- not part of the build. r=sgehani

xpinstall/packager/mac/ASEncoder/src/nsASEApp.cpp

@@ -26,6 +26,9 @@
 #endif
 
 #include <AppleEvents.h>
+#include <Balloons.h>
+#include <MacTypes.h>
+
 #include "nsEventHandler.h"
 #include "nsAppleSingleEncoder.h"
 #include "nsAppleSingleDecoder.h"

xpinstall/packager/mac/ASEncoder/src/nsAppleSingleEncoder.h

@@ -35,6 +35,9 @@
 #ifndef _NS_APPLESINGLEENCODER_H_
 #define _NS_APPLESINGLEENCODER_H_
 
+#include <MacTypes.h>
+#include <Files.h>
+
 class nsAppleSingleEncoder
 {
 

xpinstall/packager/mac/ASEncoder/src/nsEventHandler.cpp

@@ -25,6 +25,10 @@
 	#include "nsEventHandler.h"
 #endif
 
+#include <LowMem.h>
+#include <ToolUtils.h>
+
+
 #include "nsASEApp.h"
 #include "nsFileSelector.h"
 #include "nsAppleSingleEncoder.h"

xpinstall/packager/mac/ASEncoder/src/nsEventHandler.h

@@ -24,6 +24,9 @@
 #ifndef _NS_EVENTHANDLER_H_
 #define _NS_EVENTHANDLER_H_
 
+#include <MacTypes.h>
+#include <Events.h>
+
 class nsEventHandler
 {
 

xpinstall/src/nsAppleSingleDecoder.cpp

@@ -28,12 +28,16 @@
 #include "MoreFilesExtras.h"
 #include "MoreDesktopMgr.h"
 #include "IterateDirectory.h"
+#ifdef MOZILLA_CLIENT
 #include "nsISupportsUtils.h"
+#endif
 
 /*----------------------------------------------------------------------*
  *   Constructors/Destructor
  *----------------------------------------------------------------------*/
+#ifdef MOZILLA_CLIENT
 MOZ_DECL_CTOR_COUNTER(nsAppleSingleDecoder);
+#endif
 
 nsAppleSingleDecoder::nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec)
 : mInSpec(NULL), 
@@ -41,7 +45,9 @@ nsAppleSingleDecoder::nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec)
   mInRefNum(0),
   mRenameReqd(false)
 {
+#ifdef MOZILLA_CLIENT
     MOZ_COUNT_CTOR(nsAppleSingleDecoder);
+#endif
 
     if (inSpec && outSpec)
 	{
@@ -57,13 +63,17 @@ nsAppleSingleDecoder::nsAppleSingleDecoder()
   mInRefNum(0),
   mRenameReqd(false)
 {
+#ifdef MOZILLA_CLIENT
     MOZ_COUNT_CTOR(nsAppleSingleDecoder);
+#endif
 }
 
 nsAppleSingleDecoder::~nsAppleSingleDecoder()
 {
 	/* not freeing FSSpecs since we don't own 'em */
+#ifdef MOZILLA_CLIENT
     MOZ_COUNT_DTOR(nsAppleSingleDecoder);
+#endif
 }