diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-11 18:03:13 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-11 18:03:13 -0400 |
| commit | 24be98227483baf67094fa95b5633594446cd21a (patch) | |
| tree | 86bbceb9b7e9989f1e58205108546fa00fd9bc74 /src | |
| parent | 361514aca147f8826811c23cfac40c6ac995dfeb (diff) | |
Remove or indent #define GNU_SOURCE
It is only needed in files designed to be usable in standalone
compilation. In those files the #ifdefinery is indented. When
compiling in-tree, GNU_SOURCE is always defined, so remove one
definition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd-daemon/sd-daemon.c | 20 | ||||
| -rw-r--r-- | src/readahead/sd-readahead.c | 14 | ||||
| -rw-r--r-- | src/udev/cdrom_id/cdrom_id.c | 4 |
3 files changed, 17 insertions, 21 deletions
diff --git a/src/libsystemd-daemon/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c index 80aadf7adf..5b92e2e3db 100644 --- a/src/libsystemd-daemon/sd-daemon.c +++ b/src/libsystemd-daemon/sd-daemon.c @@ -25,7 +25,7 @@ ***/ #ifndef _GNU_SOURCE -#define _GNU_SOURCE +# define _GNU_SOURCE #endif #include <sys/types.h> @@ -33,9 +33,9 @@ #include <sys/socket.h> #include <sys/un.h> #ifdef __BIONIC__ -#include <linux/fcntl.h> +# include <linux/fcntl.h> #else -#include <sys/fcntl.h> +# include <sys/fcntl.h> #endif #include <netinet/in.h> #include <stdlib.h> @@ -48,21 +48,21 @@ #include <limits.h> #if defined(__linux__) -#include <mqueue.h> +# include <mqueue.h> #endif #include "sd-daemon.h" #if (__GNUC__ >= 4) -#ifdef SD_EXPORT_SYMBOLS +# ifdef SD_EXPORT_SYMBOLS /* Export symbols */ -#define _sd_export_ __attribute__ ((visibility("default"))) -#else +# define _sd_export_ __attribute__ ((visibility("default"))) +# else /* Don't export the symbols */ -#define _sd_export_ __attribute__ ((visibility("hidden"))) -#endif +# define _sd_export_ __attribute__ ((visibility("hidden"))) +# endif #else -#define _sd_export_ +# define _sd_export_ #endif _sd_export_ int sd_listen_fds(int unset_environment) { diff --git a/src/readahead/sd-readahead.c b/src/readahead/sd-readahead.c index d48cd76807..4a096eed42 100644 --- a/src/readahead/sd-readahead.c +++ b/src/readahead/sd-readahead.c @@ -25,7 +25,7 @@ ***/ #ifndef _GNU_SOURCE -#define _GNU_SOURCE +# define _GNU_SOURCE #endif #include <unistd.h> @@ -38,15 +38,15 @@ #include "sd-readahead.h" #if (__GNUC__ >= 4) -#ifdef SD_EXPORT_SYMBOLS +# ifdef SD_EXPORT_SYMBOLS /* Export symbols */ -#define _sd_export_ __attribute__ ((visibility("default"))) -#else +# define _sd_export_ __attribute__ ((visibility("default"))) +# else /* Don't export the symbols */ -#define _sd_export_ __attribute__ ((visibility("hidden"))) -#endif +# define _sd_export_ __attribute__ ((visibility("hidden"))) +# endif #else -#define _sd_export_ +# define _sd_export_ #endif static int touch(const char *path) { diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index b659cc31ee..1ad0459236 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE 1 -#endif - #include <stdio.h> #include <stddef.h> #include <stdlib.h> |