diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-21 17:37:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-21 17:37:57 +0000 |
| commit | 962b4f08f76e70ca445523027c1792883ae3ea9d (patch) | |
| tree | acce5f56e16c774fd4bb80341a0ea81f138399c8 /CMakeLists.txt | |
| parent | 8c9f80fccc7c1a646f30d2fd235d2bdc1f29d17e (diff) | |
Move common time shifting code to ui/time_shift.[ch]. Change the
shifting routines to return an error message on failure or NULL on
success. Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.
Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult. For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.
Add warning role color definitions to tango_colors.h and use them.
svn path=/trunk/; revision=46680
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0a31e6ca9..6810dcbca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ else() unset(WERROR) endif() -if(CMAKE_COMPILER_IS_GNUCC) +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER MATCHES ".*clang") set (C_UNUSED "__attribute__((unused))" ) else() set (C_UNUSED "" ) |