Getting completely rid of the int32 and whatever

extensions/source/nsplugin/source/npshell.cxx

@@ -71,25 +71,6 @@
 #include "boost/scoped_array.hpp"
 #include "tools/pathutils.hxx"
 
-//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
-//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
-#ifndef _UINT32
-#  if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
-     typedef unsigned int uint32;
-#  else  /* __alpha */
-     typedef unsigned long uint32;
-#  endif
-#  define _UINT32
-#endif
-#ifndef _INT32
-#  if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
-     typedef int int32;
-#  else  /* __alpha */
-     typedef long int32;
-#  endif
-#  define _INT32
-#endif
-
 #include "npapi.h"
 #include "npshell.hxx"
 #include "so_env.hxx"

extensions/source/nsplugin/source/npshell.hxx

@@ -42,8 +42,8 @@ typedef struct _PluginInstance
     Window window;
     Display *display;
 #endif
-    uint32 x, y;
-    uint32 width, height;
+    uint32_t x, y;
+    uint32_t width, height;
     NPMIMEType type;
     char *message;
 

extensions/source/plugin/inc/plugin/unx/plugcon.hxx

@@ -73,27 +73,6 @@ extern "C" {
 #define MOZ_X11
 #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__) || defined(AIX)
-       typedef unsigned int uint32;
-#    else  /* __alpha */
-       typedef unsigned long uint32;
-#    endif
-#    define _UINT32
-#  endif
-#  ifndef _INT32
-#    if defined(__alpha) || defined(__LP64__) || defined(AIX)
-       typedef int int32;
-#    else  /* __alpha */
-       typedef long int32;
-#    endif
-#    define _INT32
-#  endif
-#endif
-
 #if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
 extern "C" {
 #include <npsdk/npupp.h>

extensions/source/plugin/unx/npnapi.cxx

@@ -811,7 +811,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                 NPP instance            = m_aInstances[ nInstance ]->instance;
                 sal_uInt32 nFileID          = pMessage->GetUINT32();
                 NPStream* pStream       = m_aNPWrapStreams[ nFileID ];
-                int32 nRet = aPluginFuncs.writeready( instance, pStream );
+                int32_t nRet = aPluginFuncs.writeready( instance, pStream );
 
                 medDebug( 1, "pluginapp: NPP_WriteReady( %p, %p ) (stream id = %d) returns %d\n",
                           instance, pStream, nFileID, nRet );
@@ -827,10 +827,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                 NPP instance            = m_aInstances[ nInstance ]->instance;
                 sal_uInt32 nFileID          = pMessage->GetUINT32();
                 NPStream* pStream       = m_aNPWrapStreams[ nFileID ];
-                int32 offset            = pMessage->GetUINT32();
+                int32_t offset            = pMessage->GetUINT32();
                 sal_uLong len;
                 char* buffer            = (char*)pMessage->GetBytes( len );
-                int32 nRet = aPluginFuncs.write( instance, pStream, offset, len, buffer );
+                int32_t nRet = aPluginFuncs.write( instance, pStream, offset, len, buffer );
 
                 medDebug( 1,"pluginapp: NPP_Write( %p, %p, %d, %d, %p ) returns %d\n"
                           "stream = { pdata = %p, ndata = %p, url = %s, end = %d, lastmodified = %d, notifyData = %p }\n",

extensions/source/plugin/unx/nppapi.cxx

@@ -571,7 +571,7 @@ int32_t UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t offset
     if( ! pMes )
         return 0;
 
-    int32 aRet = pMes->GetUINT32();
+    int32_t aRet = pMes->GetUINT32();
     delete pMes;
 
     return aRet;