1 --- gpac/applications/osmozilla/npplat.h.orig 2005-07-13 16:34:30.000000000 +0200
2 +++ gpac/applications/osmozilla/npplat.h 2011-03-20 09:34:57.624712082 +0100
8 +#include "npfunctions.h"
10 /**************************************************/
12 --- gpac/applications/osmozilla/osmozilla.h.orig 2008-10-06 17:17:57.000000000 +0200
13 +++ gpac/applications/osmozilla/osmozilla.h 2011-03-20 10:04:41.876713758 +0100
17 #include <nsIClassInfo.h>
18 +#include <nsIProgrammingLanguage.h>
21 #include "nsIOsmozilla.h"
22 --- gpac/applications/osmozilla/osmozilla.cpp.orig 2008-10-06 17:17:57.000000000 +0200
23 +++ gpac/applications/osmozilla/osmozilla.cpp 2011-03-20 10:12:46.068709568 +0100
25 return NS_ERROR_NULL_POINTER;
27 if (aIID.Equals(kIZillaPluginIID)) {
28 - *aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
29 + *aInstancePtr = static_cast<nsIOsmozilla *>(this);
34 if (aIID.Equals(kIClassInfoIID)) {
35 - *aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
36 + *aInstancePtr = static_cast<nsIClassInfo *>(this);
41 if (aIID.Equals(kISupportsIID)) {
42 - *aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
43 + *aInstancePtr = static_cast<nsISupports *>((static_cast<nsIOsmozilla *>(this)));
47 --- gpac/applications/osmozilla/npn_gate.cpp.orig 2005-07-13 16:34:29.000000000 +0200
48 +++ gpac/applications/osmozilla/npn_gate.cpp 2011-03-20 10:24:21.496702863 +0100
50 NPError rv = NPERR_NO_ERROR;
52 if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
53 - rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance, url, target, notifyData);
54 + rv = (*NPNFuncs.geturlnotify)(instance, url, target, notifyData);
56 rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
60 NPError NPN_GetURL(NPP instance, const char *url, const char *target)
62 - NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target);
63 + NPError rv = (*NPNFuncs.geturl)(instance, url, target);
67 -NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
68 +NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
70 int navMinorVers = NPNFuncs.version & 0xFF;
71 NPError rv = NPERR_NO_ERROR;
73 if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
74 - rv = CallNPN_PostURLNotifyProc(NPNFuncs.posturlnotify, instance, url, window, len, buf, file, notifyData);
75 + rv = (*NPNFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
77 rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
82 -NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
83 +NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
85 - NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file);
86 + NPError rv = (*NPNFuncs.posturl)(instance, url, window, len, buf, file);
90 NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
92 - NPError rv = CallNPN_RequestReadProc(NPNFuncs.requestread, stream, rangeList);
93 + NPError rv = (*NPNFuncs.requestread)(stream, rangeList);
98 NPError rv = NPERR_NO_ERROR;
100 if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
101 - rv = CallNPN_NewStreamProc(NPNFuncs.newstream, instance, type, target, stream);
102 + rv = (*NPNFuncs.newstream)(instance, type, target, stream);
104 rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
109 -int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer)
110 +int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer)
112 int navMinorVersion = NPNFuncs.version & 0xFF;
116 if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
117 - rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer);
118 + rv = (*NPNFuncs.write)(instance, stream, len, buffer);
123 NPError rv = NPERR_NO_ERROR;
125 if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
126 - rv = CallNPN_DestroyStreamProc(NPNFuncs.destroystream, instance, stream, reason);
127 + rv = (*NPNFuncs.destroystream)(instance, stream, reason);
129 rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
131 @@ -138,78 +138,78 @@
133 void NPN_Status(NPP instance, const char *message)
135 - CallNPN_StatusProc(NPNFuncs.status, instance, message);
136 + (*NPNFuncs.status)(instance, message);
139 const char* NPN_UserAgent(NPP instance)
141 const char * rv = NULL;
142 - rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance);
143 + rv = (*NPNFuncs.uagent)(instance);
147 -void* NPN_MemAlloc(uint32 size)
148 +void* NPN_MemAlloc(uint32_t size)
151 - rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size);
152 + rv = (*NPNFuncs.memalloc)(size);
156 void NPN_MemFree(void* ptr)
158 - CallNPN_MemFreeProc(NPNFuncs.memfree, ptr);
159 + (*NPNFuncs.memfree)(ptr);
162 -uint32 NPN_MemFlush(uint32 size)
163 +uint32_t NPN_MemFlush(uint32_t size)
165 - uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size);
166 + uint32_t rv = (*NPNFuncs.memflush)(size);
170 void NPN_ReloadPlugins(NPBool reloadPages)
172 - CallNPN_ReloadPluginsProc(NPNFuncs.reloadplugins, reloadPages);
173 + (*NPNFuncs.reloadplugins)(reloadPages);
177 JRIEnv* NPN_GetJavaEnv(void)
180 - rv = CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv);
181 + rv = (*NPNFuncs.getJavaEnv)();
185 jref NPN_GetJavaPeer(NPP instance)
188 - rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance);
189 + rv = (*NPNFuncs.getJavaPeer)(instance);
194 NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value)
196 - NPError rv = CallNPN_GetValueProc(NPNFuncs.getvalue, instance, variable, value);
197 + NPError rv = (*NPNFuncs.getvalue)(instance, variable, value);
201 NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value)
203 - NPError rv = CallNPN_SetValueProc(NPNFuncs.setvalue, instance, variable, value);
204 + NPError rv = (*NPNFuncs.setvalue)(instance, variable, value);
208 void NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
210 - CallNPN_InvalidateRectProc(NPNFuncs.invalidaterect, instance, invalidRect);
211 + (*NPNFuncs.invalidaterect)(instance, invalidRect);
214 void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
216 - CallNPN_InvalidateRegionProc(NPNFuncs.invalidateregion, instance, invalidRegion);
217 + (*NPNFuncs.invalidateregion)(instance, invalidRegion);
220 void NPN_ForceRedraw(NPP instance)
222 - CallNPN_ForceRedrawProc(NPNFuncs.forceredraw, instance);
223 + (*NPNFuncs.forceredraw)(instance);
225 --- gpac/configure.orig 2011-05-29 21:09:10.138301981 +0200
226 +++ gpac/configure 2011-05-29 21:27:39.248339117 +0200
227 @@ -1145,6 +1145,7 @@
229 #look for GECKO support
231 +#include <mozilla-config.h>
232 #include <nsIServiceManager.h>
233 int main( void ) { return 0; }