diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-31 11:57:53 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-31 11:57:53 +0000 |
| commit | 599396acd01a065170220a5543f1c9bfec37f063 (patch) | |
| tree | 6fa19d608788853722f4c6ecf3e51c7aa008b7ac /extensions | |
| parent | c985960654eb48d7a7db97d81b61956d27a4be6c (diff) | |
#i10000# Fix solaris non-pro build.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 9 | ||||
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 88015729f6de..df23100e3859 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: so_env.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -34,11 +34,7 @@ #ifdef UNIX #include <sys/types.h> #include <strings.h> -#if defined(SOLARIS) && !defined(__GNUC__) -#include <varargs.h> -#else #include <stdarg.h> -#endif // For vsnprintf() #define NSP_vsnprintf vsnprintf #include "nsp_func.hxx" @@ -359,15 +355,14 @@ char* NSP_getPluginDesc() void NSP_WriteLog(int level, const char* pFormat, ...) { -#ifndef DEBUG (void)level; +#ifndef DEBUG (void)pFormat; #else va_list ap; char msgBuf[NPP_BUFFER_SIZE]; static char logName[NPP_PATH_MAX] = {0}; FILE * fp = NULL; - int dwPos,dwWriteBytes; va_start(ap,pFormat); NSP_vsnprintf(msgBuf, NPP_BUFFER_SIZE, pFormat, ap); diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 5db9af360551..2833cf78bdee 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xplugin.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.25 $ * * This file is part of OpenOffice.org. * @@ -779,7 +779,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, &stype ) ) { #if OSL_DEBUG_LEVEL > 1 - char* pType; + const char* pType; switch( stype ) { case NP_NORMAL: pType = "NP_NORMAL";break; |