# HG changeset patch # User Thomas Klausner # Date 1370013043 -7200 # Node ID feda56c1baecaa2f9ff349411a56d8db9779deec # Parent 7de036e9e8fd5eb12e0ecc42a51d0f1109c36024 Rename VERSION to FD_LIBFD*_VERSION to avoid conflict with autoconf VERSION define. diff -r 7de036e9e8fd -r feda56c1baec libfdcore/version.c --- a/libfdcore/version.c Fri May 31 14:57:17 2013 +0200 +++ b/libfdcore/version.c Fri May 31 17:10:43 2013 +0200 @@ -37,11 +37,11 @@ #include #ifdef FD_PROJECT_VERSION_HG -# define VERSION \ +# define FD_LIBFDCORE_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) "-" FD_PROJECT_VERSION_HG_VAL #else -# define VERSION \ +# define FD_LIBFDCORE_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) #endif -const char fd_core_version[] = VERSION; +const char fd_core_version[] = FD_LIBFDCORE_VERSION; diff -r 7de036e9e8fd -r feda56c1baec libfdproto/version.c --- a/libfdproto/version.c Fri May 31 14:57:17 2013 +0200 +++ b/libfdproto/version.c Fri May 31 17:10:43 2013 +0200 @@ -37,11 +37,11 @@ #include #ifdef FD_PROJECT_VERSION_HG -# define VERSION \ +# define FD_LIBFDPROTO_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) "-" FD_PROJECT_VERSION_HG_VAL #else -# define VERSION \ +# define FD_LIBFDPROTO_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) #endif -const char fd_libproto_version[] = VERSION; +const char fd_libproto_version[] = FD_LIBFDPROTO_VERSION;