cleanup: Add and use macro MIN().

[cparser] / adt / util.h

diff --git a/adt/util.h b/adt/util.h
index a3abdfc..05c40f1 100644 (file)
--- a/adt/util.h
+++ b/adt/util.h
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 
 /**
@@ -23,7 +8,6 @@
  * @date    16.03.2007
  * @brief   Various utility functions that wrap compiler specific extensions
  * @author  Matthias Braun
- * @version $Id$
  */
 #ifndef _FIRM_UTIL_H_
 #define _FIRM_UTIL_H_
@@ -34,9 +18,9 @@
  *
  * @note This uses the fact, that double case labels are not allowed.
  */
-#define COMPILETIME_ASSERT(x, name)    \
+#define COMPILETIME_ASSERT(x, name) \
        static __attribute__((unused)) void compiletime_assert_##name (int h) { \
-               switch(h) { case 0:     case (x): {} } \
+               switch(h) { case 0: case (x): {} } \
        }
 
 /**
@@ -52,4 +36,11 @@
 
 #define lengthof(x) (sizeof(x) / sizeof(*(x)))
 
+#define endof(x) ((x) + lengthof(x))
+
+#undef MAX
+#undef MIN
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 #endif