[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 66fd3c9d6ebaf59a07e004e22b0d7b62f460024f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 12 22:55:47 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3413463 - QuickTime plug-in content doesn't load in Safari (NPP_Write not called)
    
            * Plugins.subproj/npapi.h: Fix erroneous function pointer
    	declarations that led to an int16/int32 mismatch.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ce916a8..bace8bd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3413463 - QuickTime plug-in content doesn't load in Safari (NPP_Write not called)
+	
+        * Plugins.subproj/npapi.h: Fix erroneous function pointer
+	declarations that led to an int16/int32 mismatch.
+
 2003-09-12  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3420112>: Reproducible Safari crash in in -[WebBaseNetscapePluginView sendEvent:]
diff --git a/WebKit/Plugins.subproj/npapi.h b/WebKit/Plugins.subproj/npapi.h
index 5e01d48..b3da6e9 100644
--- a/WebKit/Plugins.subproj/npapi.h
+++ b/WebKit/Plugins.subproj/npapi.h
@@ -193,8 +193,8 @@ typedef void* (*NPN_MemAllocProcPtr)(uint32 size);
 typedef void (*NPN_MemFreeProcPtr)(void* ptr);
 typedef uint32 (*NPN_MemFlushProcPtr)(uint32 size);
 typedef void (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
-typedef NPError	(*NPN_GetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_alue);
-typedef NPError	(*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_alue);
+typedef NPError	(*NPN_GetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_value);
+typedef NPError	(*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void *value);
 typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
 typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
 typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
@@ -209,13 +209,13 @@ typedef NPError	(*NPP_SetWindowProcPtr)(NPP instance, NPWindow* window);
 typedef NPError	(*NPP_NewStreamProcPtr)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
 typedef NPError	(*NPP_DestroyStreamProcPtr)(NPP instance, NPStream* stream, NPReason reason);
 typedef void 	(*NPP_StreamAsFileProcPtr)(NPP instance, NPStream* stream, const char* fname);
-typedef int16 (*NPP_WriteReadyProcPtr)(NPP instance, NPStream* stream);
-typedef int16 (*NPP_WriteProcPtr)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
+typedef int32 (*NPP_WriteReadyProcPtr)(NPP instance, NPStream* stream);
+typedef int32 (*NPP_WriteProcPtr)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
 typedef void (*NPP_PrintProcPtr)(NPP instance, NPPrint* platformPrint);
 typedef int16 (*NPP_HandleEventProcPtr)(NPP instance, void* event);
 typedef void (*NPP_URLNotifyProcPtr)(NPP instance, const char* URL, NPReason reason, void* notifyData);
-typedef NPError	(*NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_alue);
-typedef NPError	(*NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_alue);
+typedef NPError	(*NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_value);
+typedef NPError	(*NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *value);
 typedef void (*NPP_ShutdownProcPtr)(void);
 typedef void*	JRIGlobalRef; //not using this right now
 
@@ -372,4 +372,4 @@ void		NPP_URLNotify(NPP instance, const char* URL, NPReason reason, void* notify
 NPError		NPP_GetValue(void *instance, NPPVariable variable, void *value);
 NPError		NPP_SetValue(void *instance, NPNVariable variable, void *value);
 */
-#endif /* _NPAPI_H_ */
\ No newline at end of file
+#endif /* _NPAPI_H_ */

-- 
WebKit Debian packaging