rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17309

Modified Files:
	openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch 
Log Message:
tweak

openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch:

Index: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch	6 Jun 2008 09:53:14 -0000	1.1
+++ openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch	6 Jun 2008 10:26:32 -0000	1.2
@@ -1,25 +1,34 @@
-Index: mozsrc/npapi.h
+Index: source/nsplugin/source/npshell.cxx
 ===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/npapi.h,v
-retrieving revision 1.2
-diff -u -r1.2 npapi.h
---- openoffice.org.orig/np_sdk/mozsrc/npapi.h	9 Feb 2006 14:04:20 -0000	1.2
-+++ openoffice.org/np_sdk/mozsrc/npapi.h	6 Jun 2008 09:46:09 -0000
-@@ -154,7 +154,7 @@
- #endif
+RCS file: /cvs/util/extensions/source/nsplugin/source/npshell.cxx,v
+retrieving revision 1.17
+diff -u -r1.17 npshell.cxx
+--- openoffice.org.orig/extensions/source/nsplugin/source/npshell.cxx	11 Apr 2008 10:07:27 -0000	1.17
++++ openoffice.org/extensions/source/nsplugin/source/npshell.cxx	6 Jun 2008 10:17:57 -0000
+@@ -75,6 +75,26 @@
+ #include <string.h>
+ #include <errno.h>
  
- #ifndef _UINT32
--#    if defined(__alpha)
-+#    if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
- typedef unsigned int uint32;
- #    else  /* __alpha */
- typedef unsigned long uint32;
-@@ -170,7 +170,7 @@
- #endif
++//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
++//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
++#ifdef UNIX
++#  ifndef _UINT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef unsigned int uint32;
++#    else  /* __alpha */
++       typedef unsigned long uint32;
++#    endif
++#    define _UINT32
++#  endif
++#  ifndef _INT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef int int32;
++#    else  /* __alpha */
++       typedef long int32;
++#    endif
++#    define _INT32
++#  endif
++#endif
  
- #ifndef _INT32
--#    if defined(__alpha)
-+#    if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
- typedef int int32;
- #    else  /* __alpha */
- typedef long int32;
+ #include "npapi.h"
+ #include "npshell.hxx"