X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f9d42b20477523bf2ab2172d51e78d2a398e117f..417ef7de00568897d331d282478d93b323574f8c:/lib/bits.c

diff --git a/lib/bits.c b/lib/bits.c
index d570e64..25ef6a7 100644
--- a/lib/bits.c
+++ b/lib/bits.c
@@ -2,33 +2,31 @@
  * This file is part of DisOrder
  * Copyright (C) 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ * 
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file lib/bits.c
  * @brief Bit operations
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <math.h>
 
 #include "bits.h"
 
+#if !HAVE_FLS
 /** @brief Compute index of leftmost 1 bit
  * @param n Integer
  * @return Index of leftmost 1 bit or -1
@@ -69,7 +67,7 @@ int leftmost_bit(uint32_t n) {
    */
   return x - 1;
 }
-
+#endif
 
 /*
 Local Variables: