diff options
| author | Guillem Jover <guillem@debian.org> | 2010-03-24 12:50:06 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2010-03-25 00:42:07 +0100 |
| commit | 7e98241b11ce27e8d7fb87f1e64ecd03ec0ea0bf (patch) | |
| tree | 29d03af055db5d48bcbaa4996d36518f68f442bb /dselect | |
| parent | 0fb104820dca0437cfdc045454010aeb89371754 (diff) | |
| download | dpkg-7e98241b11ce27e8d7fb87f1e64ecd03ec0ea0bf.tar.gz | |
dselect: Show dependency/conflicts resolution screen again
Fix by switching the C++ code to use STL's min() and max() instead of
preprocessor macros, to avoid multiple evaluation of arguments.
Regression introduced in commit f426b031ac858fa30ace69959a43b61fb40f4be9.
Closes: #574816
Based-on-patch-by: Robert Luberda <robert@debian.org>
Diffstat (limited to 'dselect')
| -rw-r--r-- | dselect/dselect.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dselect/dselect.h b/dselect/dselect.h index fee948d34..d4c147f58 100644 --- a/dselect/dselect.h +++ b/dselect/dselect.h @@ -24,6 +24,11 @@ #include <signal.h> +#include <algorithm> + +using std::min; +using std::max; + #include "dselect-curses.h" #define DSELECT "dselect" |