Reviewed by Tim O.

        <rdar://problem/4682225> conflicting typedefs in Netscape plug-in headers

        * Plugins/npfunctions.h: fix the return type for NPN_IntFromIdentifierProcPtr to be int32_t

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9dda6137c69ebb30d38dba41ec1aeadb8f1c4c32..8b4eb93792dcd30ac01d058c857373900882ca56 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-05  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Tim O.
+
+        <rdar://problem/4682225> conflicting typedefs in Netscape plug-in headers
+
+        * Plugins/npfunctions.h: fix the return type for NPN_IntFromIdentifierProcPtr to be int32_t
+
 2006-09-04  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/Plugins/npfunctions.h b/WebKit/Plugins/npfunctions.h
index c3a09947f932f8a8614b1b906f4e58651a071540..849544b7a924b7167b3c31d953ae8e8897b565df 100644 (file)
--- a/WebKit/Plugins/npfunctions.h
+++ b/WebKit/Plugins/npfunctions.h
@@ -35,7 +35,7 @@ typedef void (*NPN_ReleaseVariantValueProcPtr) (NPVariant *variant);
 typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr) (const NPUTF8 *name);
 typedef void (*NPN_GetStringIdentifiersProcPtr) (const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers);
 typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr) (int32_t intid);
-typedef NPIdentifier (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
+typedef int32_t (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
 typedef bool (*NPN_IdentifierIsStringProcPtr) (NPIdentifier identifier);
 typedef NPUTF8 *(*NPN_UTF8FromIdentifierProcPtr) (NPIdentifier identifier);