X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=adt%2Fbitfiddle.h;h=8cbb14c62dbd58b02e4fbc5f3d5231457e88f34c;hb=23ebb996cbe0f5d2c74184d1cfb783cb2a529a13;hp=827d21a797d15933597bfd98fe8ff15d8b733b2a;hpb=128c6e023edaee3a29e8c50932ba7f36c735b0d0;p=cparser

diff --git a/adt/bitfiddle.h b/adt/bitfiddle.h
index 827d21a..8cbb14c 100644
--- a/adt/bitfiddle.h
+++ b/adt/bitfiddle.h
@@ -1,9 +1,28 @@
+/*
+ * 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.
+ */
+
 /**
  * @file
  * @date    28.9.2004
  * @brief   Functions from hackers delight.
  * @author  Sebastian Hack, Matthias Braun
- * @version $Id$
  */
 #ifndef _FIRM_BITFIDDLE_H_
 #define _FIRM_BITFIDDLE_H_
@@ -24,7 +43,7 @@ COMPILETIME_ASSERT(UINT_MAX == 4294967295U, uintmax)
  *
  * @note See hacker's delight, page 27.
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 int add_saturated(int x, int y)
 {
 	int sum      = x + y;
@@ -53,7 +72,7 @@ int add_saturated(int x, int y)
  * @param x A 32-bit word.
  * @return The number of bits set in x.
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 unsigned popcnt(unsigned x) {
 	x -= ((x >> 1) & 0x55555555);
 	x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
@@ -68,7 +87,7 @@ unsigned popcnt(unsigned x) {
  * @param x The word.
  * @return The number of leading (from the most significant bit) zeros.
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 unsigned nlz(unsigned x) {
 #ifdef USE_X86_ASSEMBLY
 	unsigned res;
@@ -80,7 +99,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;
@@ -94,7 +113,7 @@ unsigned nlz(unsigned x) {
  * @param x The word.
  * @return The number of trailing zeros.
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 unsigned ntz(unsigned x) {
 #ifdef USE_X86_ASSEMBLY
 	unsigned res;
@@ -161,7 +180,7 @@ unsigned floor_po2(unsigned x)
  * @remark x has to be <= 0x8000000 of course
  * @note see hackers delight power-of-2 boundaries, page 48
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 unsigned ceil_po2(unsigned x)
 {
 	if(x == 0)
@@ -185,7 +204,7 @@ unsigned ceil_po2(unsigned x)
 /**
  * Tests whether @p x is a power of 2
  */
-static INLINE __attribute__((const))
+static inline __attribute__((const))
 int is_po2(unsigned x)
 {
 	return (x & (x-1)) == 0;