30 lines
545 B
Plaintext
30 lines
545 B
Plaintext
$NetBSD: patch-ah,v 1.5 2011/11/25 22:08:30 joerg Exp $
|
|
|
|
--- src/celutil/util.h.orig 2005-08-15 20:34:43.000000000 +0000
|
|
+++ src/celutil/util.h
|
|
@@ -12,22 +12,16 @@
|
|
#ifndef _UTIL_H_
|
|
#define _UTIL_H_
|
|
|
|
+#include <algorithm>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <iostream>
|
|
#include <functional>
|
|
|
|
-#ifndef min
|
|
-#define min(a, b) ((a) < (b) ? (a) : (b))
|
|
-#endif
|
|
-
|
|
-#ifndef max
|
|
-#define max(a, b) ((a) < (b) ? (b) : (a))
|
|
-#endif
|
|
-
|
|
#ifdef _WIN32
|
|
#define _(s) s
|
|
#else
|
|
+#include <libintl.h>
|
|
#define _(s) gettext(s)
|
|
#endif
|
|
|