cleanup: Use round_up2() instead of duplicating it.

[cparser] / adt / bitfiddle.h

diff --git a/adt/bitfiddle.h b/adt/bitfiddle.h
index 2798319..334d3a5 100644 (file)
--- a/adt/bitfiddle.h
+++ b/adt/bitfiddle.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,12 +8,13 @@
  * @date    28.9.2004
  * @brief   Functions from hackers delight.
  * @author  Sebastian Hack, Matthias Braun
- * @version $Id$
  */
 #ifndef _FIRM_BITFIDDLE_H_
 #define _FIRM_BITFIDDLE_H_
 
+#include <assert.h>
 #include <limits.h>
+
 #include "util.h"
 
 /* some functions here assume ints are 32 bit wide */
@@ -100,7 +86,7 @@ unsigned nlz(unsigned x) {
                        : "r" (x));
        return 31 - res;
 #else
-       x |= x >> 1;
+       x |= x >> 1;
        x |= x >> 2;
        x |= x >> 4;
        x |= x >> 8;