From 7a47e0ead3471f8f6e737a79704ad8ad2978418a Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 4 Nov 2011 13:13:04 +0000 Subject: gtk: use a more sensibly unique version define --- vcl/Library_vclplug_gtk.mk | 2 +- vcl/Library_vclplug_gtk3.mk | 2 +- vcl/unx/gtk/a11y/atkutil.cxx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'vcl') diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index e2f9b8d68479..b39b53a4f1f4 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ + -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) $(eval $(call gb_Library_add_api,vclplug_gtk,\ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 946a624fc9fd..66a3197c75c4 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ + -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) $(eval $(call gb_Library_add_api,vclplug_gtk3,\ diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index d3d9824dcc82..026a6d9c917c 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -704,8 +704,7 @@ ooo_atk_util_get_toolkit_version (void) * Version is passed in as a -D flag when this file is * compiled. */ - - return VERSION; + return LIBO_VERSION; } /*****************************************************************************/ -- cgit