diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Macros.hxx | 35 | ||||
| -rw-r--r-- | src/util/list_sort.c | 6 |
2 files changed, 38 insertions, 3 deletions
diff --git a/src/util/Macros.hxx b/src/util/Macros.hxx new file mode 100644 index 000000000..6f6bd9f48 --- /dev/null +++ b/src/util/Macros.hxx @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2010-2013 Max Kellermann <max@duempel.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef MACROS_HPP +#define MACROS_HPP + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + +#endif diff --git a/src/util/list_sort.c b/src/util/list_sort.c index ddf3208e9..8534f3360 100644 --- a/src/util/list_sort.c +++ b/src/util/list_sort.c @@ -24,12 +24,12 @@ #include "list_sort.h" #include "list.h" +#include "Macros.hxx" +#include "Compiler.h" -#include <glib.h> #include <string.h> -#define unlikely G_UNLIKELY -#define ARRAY_SIZE G_N_ELEMENTS +#define unlikely gcc_unlikely #define MAX_LIST_LENGTH_BITS 20 |