Use browser-installed headers instead of the bundled (obsolete)
copies...

Fix other bugs/deficiencies...

	-mi

--- player/app/plugin/nsHXPlayer.cpp	Mon Nov 22 19:24:25 2004
+++ player/app/plugin/nsHXPlayer.cpp	Tue Oct 24 13:13:00 2006
@@ -56,5 +56,4 @@
 #include "hxbackend.h"
 #include "tokenizer.h"
-#include "asprintf.h"
 
 #include <stdlib.h>
--- player/app/plugin/hxbackend.cpp	Sun Oct 22 13:33:21 2006
+++ player/app/plugin/hxbackend.cpp	Sun Oct 22 13:50:24 2006
@@ -66,14 +66,11 @@
 #include <signal.h>
 
-#include "npplat.h"
-#include "hxbackend.h"
-#include "asprintf.h"
 #include "hxtypes.h"
-
 #include "tokenizer.h"
+#include "hxbackend.h"
 
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMWindow.h"
+#include <nsIServiceManager.h>
+#include <nsIComponentManager.h>
+#include <nsIDOMWindow.h>
 
 #define EXIT_CODE_UNKNOWN          0
@@ -358,5 +357,5 @@ nsresult CHXPlayerBackend::ReceiveMessag
     {
         /* Trim back the buffer to the size we actually used (plus NULL) */
-        pBuf = (char*)realloc(pBuf, nPos + 1);
+        *ppBuf = (char*)realloc(pBuf, nPos + 1);
     }
     else
--- player/app/plugin/nsHXPlayer.h	Sun Oct 22 13:59:54 2006
+++ player/app/plugin/nsHXPlayer.h	Sun Oct 22 14:11:15 2006
@@ -51,10 +51,12 @@
 #define __NS_HXPLAYER_H__
 
-#include "nsISupports.h"
-#include "nsIClassInfo.h"
+#include <nsISupports.h>
+#include <nsIClassInfo.h>
 #include "nsIHXPlayer.h"
-#include "nsISupportsImpl.h"
+#include <nsISupportsImpl.h>
 #include "embddef.h"
-#include "npapi.h"
+#include <npapi.h>
 #include "pluginbase.h"
+#include <nscore.h>
+#include <mozilla/XPCOM.h>
 
--- player/app/plugin/include/npplat.h	2011-06-12 02:06:11.000000000 -0400
+++ player/app/plugin/include/npplat.h	2011-06-12 02:07:01.000000000 -0400
@@ -39,6 +39,6 @@
 #define _NPPLAT_H_
 
-#include "npapi.h"
-#include "npupp.h"
+#include <npapi.h>
+#include <npfunctions.h>
 
 /**************************************************/
--- player/app/plugin/include/pluginbase.h	2007-07-06 16:49:22.000000000 -0400
+++ player/app/plugin/include/pluginbase.h	2011-06-12 02:42:24.000000000 -0400
@@ -39,4 +39,5 @@
 #define __PLUGININSTANCEBASE_H__
 
+#include <stdlib.h>
 #include "npplat.h"
 
@@ -45,6 +46,6 @@
   NPP instance;
   NPMIMEType type; 
-  uint16 mode; 
-  int16 argc; 
+  uint16_t mode; 
+  int16_t argc; 
   char** argn; 
   char** argv; 
@@ -65,12 +66,12 @@
   virtual NPError SetWindow(NPWindow* )                    { return NPERR_NO_ERROR; }
   virtual NPError NewStream(NPMIMEType, NPStream*, 
-                            NPBool, uint16*)               { return NPERR_NO_ERROR; }
+                            NPBool, uint16_t*)               { return NPERR_NO_ERROR; }
   virtual NPError DestroyStream(NPStream *, NPError)       { return NPERR_NO_ERROR; }
   virtual void    StreamAsFile(NPStream*, const char*)     { return; }
-  virtual int32   WriteReady(NPStream *)                   { return 0x0fffffff; }
-  virtual int32   Write(NPStream *, int32, 
-                        int32 len, void *)                 { return len; }
+  virtual int32_t   WriteReady(NPStream *)                   { return 0x0fffffff; }
+  virtual int32_t   Write(NPStream *, int32_t, 
+                        int32_t len, void *)                 { return len; }
   virtual void    Print(NPPrint*)                          { return; }
-  virtual uint16  HandleEvent(void*)                       { return 0; }
+  virtual uint16_t  HandleEvent(void*)                       { return 0; }
   virtual void    URLNotify(const char*, NPReason, 
                             void*)                         { return; }