diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 13:13:04 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:19:33 +0000 |
| commit | 7a47e0ead3471f8f6e737a79704ad8ad2978418a (patch) | |
| tree | e81d7e3885eac9b9daba10ce1793ea2ca1ea9395 | |
| parent | 60ea258057b0f11bbd511c19ee2832d7f039e169 (diff) | |
gtk: use a more sensibly unique version define
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 3 |
3 files changed, 3 insertions, 4 deletions
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; } /*****************************************************************************/ |