diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 01:42:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 01:42:03 +0000 |
| commit | abc482e578333f820bba559ce183cb71879e8c72 (patch) | |
| tree | 11d08bc5430aee50bb94f35607d0f4d9e084f49c /tools | |
| parent | 383467b2b3ab7f5779c399c1af49074b16722b45 (diff) | |
Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.
Put _U_'s definition in config.h when building with autofoo and on Windows.
svn path=/trunk/; revision=45034
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lemon/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tools/lemon/lemon.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index ebcf451d10..a6c53372c2 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -41,12 +41,6 @@ set(lemon_LIBS # Do we need something here on any platform? ) -if(CMAKE_COMPILER_IS_GNUCC) - add_definitions(-D_U_=__attribute__\(\(unused\)\)) -else() - add_definitions(-D_U_=) -endif() - add_executable(lemon ${lemon_FILES}) target_link_libraries(lemon ${lemon_LIBS}) diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index ee4b47df90..f075243c23 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -28,6 +28,9 @@ ** Updated to sqlite lemon version 1.59 ** $Id$ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include <stdio.h> #include <stdarg.h> |