diff options
author | Michael Meeks <michael.meeks@suse.com> | 2011-11-08 12:33:13 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-08 12:36:08 +0000 |
commit | d448b59e4b808b2074cd733bb15ed55f851da5ed (patch) | |
tree | 027f259c30ddc6c533dc3f1b76e87f90c434a170 /extensions | |
parent | oosplash: remove redundant mac conditionals - we don't build on OS/X (diff) | |
download | core-d448b59e4b808b2074cd733bb15ed55f851da5ed.tar.gz core-d448b59e4b808b2074cd733bb15ed55f851da5ed.zip |
fix build against new npapi.h (some more)
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 8 | ||||
-rw-r--r-- | extensions/source/plugin/base/nfuncs.cxx | 10 | ||||
-rw-r--r-- | extensions/source/plugin/unx/npnapi.cxx | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index 7fb1d52feb09..731d5abdf262 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -666,20 +666,20 @@ NPP_NewStream(NPP instance, } -int32 STREAMBUFSIZE = 0X0FFFFFFF; +int32_t STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in NPAsFile * mode so we can take any size stream in our * write call (since we ignore it) */ -int32 +int32_t NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/) { return STREAMBUFSIZE; } -int32 -NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32 /*offset*/, int32 len, void* /*buffer*/) +int32_t +NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t len, void* /*buffer*/) { return len; /* The number of bytes accepted */ } diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 113aee54c5a8..2f72d93440a5 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -213,7 +213,7 @@ IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl ) extern "C" { - void* SAL_CALL NP_LOADDS NPN_MemAlloc( uint32 nBytes ) + void* SAL_CALL NP_LOADDS NPN_MemAlloc( uint32_t nBytes ) { TRACE( "NPN_MemAlloc" ); void* pMem = malloc( nBytes ); @@ -226,7 +226,7 @@ extern "C" { free( pMem ); } - uint32 SAL_CALL NP_LOADDS NPN_MemFlush( uint32 /*nSize*/ ) + uint32_t SAL_CALL NP_LOADDS NPN_MemFlush( uint32_t /*nSize*/ ) { TRACE( "NPN_MemFlush" ); return 0; @@ -334,7 +334,7 @@ extern "C" { return NPERR_NO_ERROR; } - NPError SAL_CALL NP_LOADDS NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData ) + NPError SAL_CALL NP_LOADDS NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32_t len, const char* buf, NPBool file, void* notifyData ) { TRACE( "NPN_PostURLNotify" ); XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance ); @@ -376,7 +376,7 @@ extern "C" { return NPERR_NO_ERROR; } - NPError SAL_CALL NP_LOADDS NPN_PostURL( NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file ) + NPError SAL_CALL NP_LOADDS NPN_PostURL( NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file ) { TRACE( "NPN_PostURL" ); XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance ); @@ -526,7 +526,7 @@ void SAL_CALL NP_LOADDS NPN_Version( int* major, int* minor, int* net_major, in *net_minor = 5; } -int32 SAL_CALL NP_LOADDS NPN_Write( NPP instance, NPStream* stream, int32 len, +int32_t SAL_CALL NP_LOADDS NPN_Write( NPP instance, NPStream* stream, int32_t len, void* buffer ) { TRACE( "NPN_Write" ); diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 837a1f238293..ceb79cc3cbaf 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -56,7 +56,7 @@ void* CreateNewShell( void**, XLIB_Window ); // begin Netscape plugin api calls extern "C" { -static void* l_NPN_MemAlloc( uint32 nBytes ) +static void* l_NPN_MemAlloc( uint32_t nBytes ) { void* pMem = new char[nBytes]; return pMem; @@ -67,7 +67,7 @@ static void l_NPN_MemFree( void* pMem ) delete [] (char*)pMem; } -static uint32 l_NPN_MemFlush( uint32 /*nSize*/ ) +static uint32_t l_NPN_MemFlush( uint32_t /*nSize*/ ) { return 0; } @@ -209,7 +209,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe return aRet; } -static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData ) +static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32_t len, const char* buf, NPBool file, void* notifyData ) { sal_uInt32 nInstance = pConnector->GetNPPID( instance ); if( nInstance == PluginConnector::UnknownNPPID ) @@ -234,7 +234,7 @@ static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* t return aRet; } -static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file ) +static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file ) { sal_uInt32 nInstance = pConnector->GetNPPID( instance ); if( nInstance == PluginConnector::UnknownNPPID ) @@ -340,7 +340,7 @@ static const char* l_NPN_UserAgent( NPP instance ) return pAgent; } -static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer ) +static int32_t l_NPN_Write( NPP instance, NPStream* stream, int32_t len, void* buffer ) { sal_uInt32 nFileID = pConnector->GetStreamID( stream ); if( nFileID == PluginConnector::UnknownStreamID ) |