Merge config aliasing bug fix.

[disorder] / lib / table.h

diff --git a/lib/table.h b/lib/table.h
index 8cdfcfd985707602cfae7c7cc292dcebef9e5042..db237acf0ff3af38c7e51920d3c2b3931bf06d00 100644 (file)
--- a/lib/table.h
+++ b/lib/table.h
@@ -2,25 +2,27 @@
  * This file is part of DisOrder
  * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This file is part of DisOrder
  * Copyright (C) 2004, 2005, 2007, 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
  * 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.
  * (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
  * 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/table.h
+ * @brief Generic binary search

  */
  */

-

 #ifndef TABLE_H
 #define TABLE_H
 
 #ifndef TABLE_H
 #define TABLE_H
 

+#include <stddef.h>
+

 #define TABLE_FIND(TABLE, FIELD, NAME)                 \
   table_find((void *)TABLE,                            \
             offsetof(typeof((TABLE)[0]), FIELD),       \
 #define TABLE_FIND(TABLE, FIELD, NAME)                 \
   table_find((void *)TABLE,                            \
             offsetof(typeof((TABLE)[0]), FIELD),       \