From: Florian Forster Date: Mon, 22 Nov 2010 09:18:45 +0000 (+0100) Subject: Request X/Open 7 rather than declaring strdup ourselves. X-Git-Tag: v1.0.0~26 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1994d8e13989540139039a552002378b46a8f449;p=sort-networks.git Request X/Open 7 rather than declaring strdup ourselves. --- diff --git a/src/pop_stats.c b/src/pop_stats.c index 7a13c82..7f799f8 100644 --- a/src/pop_stats.c +++ b/src/pop_stats.c @@ -19,6 +19,16 @@ * Florian octo Forster **/ +#ifndef _ISOC99_SOURCE +# define _ISOC99_SOURCE +#endif +#ifndef _POSIX_C_SOURCE +# define _POSIX_C_SOURCE 200809L +#endif +#ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 700 +#endif + #include #include #include @@ -29,10 +39,6 @@ #include "pop_stats.h" -/* Yes, this is ugly, but the GNU libc doesn't export it with the above flags. - * */ -char *strdup (const char *s); - struct pop_stats_s /* {{{ */ { pthread_mutex_t lock; diff --git a/src/sn-evolution.c b/src/sn-evolution.c index 71f0c67..8774f4a 100644 --- a/src/sn-evolution.c +++ b/src/sn-evolution.c @@ -23,7 +23,10 @@ # define _ISOC99_SOURCE #endif #ifndef _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 200112L +# define _POSIX_C_SOURCE 200809L +#endif +#ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 700 #endif #include @@ -50,10 +53,6 @@ # define __attribute__(x) /**/ #endif -/* Yes, this is ugly, but the GNU libc doesn't export it with the above flags. - * */ -char *strdup (const char *s); - static uint64_t iteration_counter = 0; static int inputs_num = 16; static int inputs_num_is_power_of_two = 1; diff --git a/src/sn-evolution2.c b/src/sn-evolution2.c index c18c30d..2f894ec 100644 --- a/src/sn-evolution2.c +++ b/src/sn-evolution2.c @@ -23,7 +23,10 @@ # define _ISOC99_SOURCE #endif #ifndef _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 200112L +# define _POSIX_C_SOURCE 200809L +#endif +#ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 700 #endif #include @@ -48,13 +51,13 @@ #include "sn_network.h" #include "sn_random.h" +#if !defined(__GNUC__) || !__GNUC__ +# define __attribute__(x) /**/ +#endif + #define SNE_MIN(a,b) ((a) < (b) ? (a) : (b)) #define SNE_MAX(a,b) ((a) > (b) ? (a) : (b)) -/* Yes, this is ugly, but the GNU libc doesn't export it with the above flags. - * */ -char *strdup (const char *s); - static uint64_t iteration_counter = 0; static int inputs_num = -1; @@ -76,7 +79,7 @@ static int weight_overall = 50; static int weight_fails = 2; static int weight_stages = 1; -static void sigint_handler (int signal) +static void sigint_handler (__attribute__((unused)) int signal) { do_loop++; } /* void sigint_handler */ @@ -394,7 +397,7 @@ static int create_offspring (void) return (0); } /* int create_offspring */ -static void *evolution_thread (void *arg) +static void *evolution_thread (__attribute__((unused)) void *arg) { while (do_loop == 0) {