jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 ++--
sfx2/source/appl/shutdownicon.cxx | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a429142bfb282f7bd8166d4e91052cb5009608bd
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Mar 27 12:19:16 2013 +0200
WaE: macro "RUNNING_ON_VALGRIND" is not used
Change-Id: Ie60882c86008506a331087a241f15e931c5eacee
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 9ac4503..27b704d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -57,13 +57,13 @@
#ifdef ANDROID
#include <osl/detail/android-bootstrap.h>
-#endif
-
+#else
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/valgrind.h>
#else
#define RUNNING_ON_VALGRIND 0
#endif
+#endif
#define SUN_MICRO "Sun Microsystems Inc."
commit f241e2b0c70dbbbe682cd719e135f5c54b924183
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Mar 27 12:15:54 2013 +0200
WaE: macro is not used
Change-Id: I5feb344a98465e5bd85e233cb4bb4b34c93344dd
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index c6df67a..59af38e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -115,9 +115,6 @@ extern "C" {
}
#endif
-#define DOSTRING( x ) #x
-#define STRING( x ) DOSTRING( x )
-
bool ShutdownIcon::LoadModule( osl::Module **pModule,
oslGenericFunction *pInit,
oslGenericFunction *pDeInit )
@@ -147,6 +144,10 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
oslGenericFunction pTmpInit = NULL;
oslGenericFunction pTmpDeInit = NULL;
+
+#define DOSTRING( x ) #x
+#define STRING( x ) DOSTRING( x )
+
if ( pPlugin->loadRelative( &thisModule, OUString (STRING( PLUGIN_NAME )
) ) )
{
pTmpInit = pPlugin->getFunctionSymbol(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
