From b28f662869854ac7dafc385ad78b04cd4c25853c Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 29 May 2010 13:56:21 +0000 Subject: [PATCH] bah. VMIN conflicts with system header defines ... termin.h SVN revision: 49299 --- legacy/ecore/configure.ac | 2 +- legacy/ecore/src/lib/ecore/ecore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 0e8d6bf1c0..5c81e377b9 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -43,7 +43,7 @@ AC_PROG_LIBTOOL m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) m4_ifdef([v_rel], , [m4_define([v_rel], [])]) AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) -AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) +AC_DEFINE_UNQUOTED(VERS_MIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) version_info="lt_rev:lt_cur:lt_age" diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c index 290ddc4169..bc50084dc8 100644 --- a/legacy/ecore/src/lib/ecore/ecore.c +++ b/legacy/ecore/src/lib/ecore/ecore.c @@ -39,7 +39,7 @@ #if HAVE_MALLINFO #include -static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV }; +static Ecore_Version _version = { VMAJ, VERS_MIN, VMIC, VREV }; EAPI Ecore_Version *ecore_version = &_version; #define KEEP_MAX(Global, Local) \