summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-03-19 16:44:12 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-03-20 11:34:18 +0100
commit52f8321c412cad280c9029f10f9aef03f4f20544 (patch)
tree9942cfe490f7107177ad69175be3039b0f20b32a /extensions
parent151abb8b2b9d3a22229b98cec12e29484d12109b (diff)
use #if instead of #ifdef for testing config_xxx.hxx macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx2
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx8
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx12
3 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index cdb8b39f445f..cc27cc219578 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -94,7 +94,7 @@ extern "C" {
#include <config_vclplug.h>
-#ifdef ENABLE_GTK
+#if ENABLE_GTK
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#else
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 90b82bcad108..09fea9224638 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -410,7 +410,7 @@ static NPError l_NPN_GetValue( NPP, NPNVariable variable, void* value )
SAL_INFO("extensions.plugin", "xembed requested");
break;
case NPNVToolkit:
-# ifdef ENABLE_GTK
+# if ENABLE_GTK
*(int*)value = NPNVGtk2;
# else
*(int*)value = 0;
@@ -589,7 +589,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
"0000", 4,
NULL );
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
if( pInst->pGtkWindow )
g_object_unref( G_OBJECT(pInst->pGtkWindow) );
if( pInst->pGtkWidget )
@@ -675,7 +675,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
" \"" << pInst->argn[i] << "\"=\"" << pInst->argv[i]
<< "\"");
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
// check if XEMBED is to be used
// ask for Bool. there seems to be no clear definition whether the
// return value should be an int or unsigned char
@@ -712,7 +712,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
if( pWindow->height < 1 )
pWindow->height = 1;
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
if( pInst->bShouldUseXEmbed )
{
if( ! pInst->pGtkWidget )
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 64798ac15107..a5c800f412c2 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -79,7 +79,7 @@ extern "C"
return 0;
}
- #ifndef ENABLE_GTK
+ #if ! ENABLE_GTK
static void ThreadEventHandler( XtPointer /*client_data*/, int* /*source*/, XtInputId* id )
{
char buf[256];
@@ -231,7 +231,7 @@ static void signal_handler( int nSig )
_exit(nSig);
}
-#ifdef ENABLE_GTK
+#if ENABLE_GTK
static gboolean noClosure( gpointer )
{
@@ -393,7 +393,7 @@ int main( int argc, char **argv)
}
int nSocket = atol( argv[1] );
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
g_thread_init(NULL);
gtk_init(&argc, &argv);
#endif
@@ -408,7 +408,7 @@ int main( int argc, char **argv)
pXtAppDisplay = XtOpenDisplay( app_context, NULL, "SOPlugin", "SOPlugin", NULL, 0, &argc, argv );
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
// integrate Xt events into GTK event loop
GPollFD aXtPollDesc, aWakeupPollDesc;
@@ -481,7 +481,7 @@ int main( int argc, char **argv)
// of XtAppMainLoop
do
{
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
g_main_context_iteration( NULL, sal_True );
#else
XtAppProcessEvent( app_context, XtIMAll );
@@ -490,7 +490,7 @@ int main( int argc, char **argv)
SAL_INFO("extensions.plugin", "left plugin app main loop");
- #ifdef ENABLE_GTK
+ #if ENABLE_GTK
g_source_remove(xt_polling_timer_id);
#endif