diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-06-15 21:52:53 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-06-15 21:52:53 -0400 |
| commit | 57d5fff5f7dd9af27152c84ce041c18597a22766 (patch) | |
| tree | 776104184e234d868cfee0a84969e533bb55e631 | |
| parent | 1dd6eee692be09f04398f378446afec96bc112f2 (diff) | |
| download | musl-57d5fff5f7dd9af27152c84ce041c18597a22766.tar.gz musl-57d5fff5f7dd9af27152c84ce041c18597a22766.tar.bz2 musl-57d5fff5f7dd9af27152c84ce041c18597a22766.tar.xz musl-57d5fff5f7dd9af27152c84ce041c18597a22766.zip | |
header file fixes: multiple include guard consistency and correctness
one file was reusing another file's macro name, and many had
inconsistent underscores and application of SYS prefix, etc.
patch by Szabolcs Nagy (nsz)
| -rw-r--r-- | include/arpa/nameser.h | 4 | ||||
| -rw-r--r-- | include/elf.h | 2 | ||||
| -rw-r--r-- | include/net/ethernet.h | 4 | ||||
| -rw-r--r-- | include/paths.h | 4 | ||||
| -rw-r--r-- | include/resolv.h | 4 | ||||
| -rw-r--r-- | include/sys/fsuid.h | 4 | ||||
| -rw-r--r-- | include/sys/sendfile.h | 4 | ||||
| -rw-r--r-- | include/sys/sysmacros.h | 4 | ||||
| -rw-r--r-- | include/syscall.h | 2 | ||||
| -rw-r--r-- | include/syslog.h | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 0f854600..778d3e72 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,5 +1,5 @@ -#ifndef _ARPA_NAMESER_H_ -#define _ARPA_NAMESER_H_ +#ifndef _ARPA_NAMESER_H +#define _ARPA_NAMESER_H #define __NAMESER 19991006 #define NS_PACKETSZ 512 diff --git a/include/elf.h b/include/elf.h index b011e784..58340278 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1,5 +1,5 @@ #ifndef _ELF_H -#define _ELF_H 1 +#define _ELF_H #ifdef __cplusplus extern "C" { diff --git a/include/net/ethernet.h b/include/net/ethernet.h index f3c11e7d..c8d4177f 100644 --- a/include/net/ethernet.h +++ b/include/net/ethernet.h @@ -1,5 +1,5 @@ -#ifndef __NET_ETHERNET_H -#define __NET_ETHERNET_H 1 +#ifndef _NET_ETHERNET_H +#define _NET_ETHERNET_H #ifdef __cplusplus extern "C" { diff --git a/include/paths.h b/include/paths.h index 80219170..d0a5a6d6 100644 --- a/include/paths.h +++ b/include/paths.h @@ -1,5 +1,5 @@ -#ifndef _PATHS_H_ -#define _PATHS_H_ +#ifndef _PATHS_H +#define _PATHS_H #define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin" #define _PATH_STDPATH "/bin:/usr/bin:/sbin:/usr/sbin" diff --git a/include/resolv.h b/include/resolv.h index 5bb0832e..855c3c47 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -1,5 +1,5 @@ -#ifndef _RESOLV_H_ -#define _RESOLV_H_ +#ifndef _RESOLV_H +#define _RESOLV_H #include <stdint.h> #include <arpa/nameser.h> diff --git a/include/sys/fsuid.h b/include/sys/fsuid.h index f62184c5..c7a9b8fa 100644 --- a/include/sys/fsuid.h +++ b/include/sys/fsuid.h @@ -1,5 +1,5 @@ -#ifndef _FSUID_H -#define _FSUID_H +#ifndef _SYS_FSUID_H +#define _SYS_FSUID_H #ifdef __cplusplus extern "C" { diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h index 4bd3ec6c..1f2b5231 100644 --- a/include/sys/sendfile.h +++ b/include/sys/sendfile.h @@ -1,5 +1,5 @@ -#ifndef _SYS_INOTIFY_H -#define _SYS_INOTIFY_H +#ifndef _SYS_SENDFILE_H +#define _SYS_SENDFILE_H #ifdef __cplusplus extern "C" { diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index a2e2eaa2..65ab60cd 100644 --- a/include/sys/sysmacros.h +++ b/include/sys/sysmacros.h @@ -1,5 +1,5 @@ -#ifndef _SYSMACROS_H -#define _SYSMACROS_H +#ifndef _SYS_SYSMACROS_H +#define _SYS_SYSMACROS_H #define major(x) (((x) >> 8) & 0xff) #define minor(x) ((x) & 0xff) diff --git a/include/syscall.h b/include/syscall.h index f2043aa8..4c305784 100644 --- a/include/syscall.h +++ b/include/syscall.h @@ -1 +1 @@ -#include <sys/syscall.h>
\ No newline at end of file +#include <sys/syscall.h> diff --git a/include/syslog.h b/include/syslog.h index 278945f9..c0fde112 100644 --- a/include/syslog.h +++ b/include/syslog.h @@ -1,5 +1,5 @@ -#ifndef _SYS_SYSLOG_H -#define _SYS_SYSLOG_H +#ifndef _SYSLOG_H +#define _SYSLOG_H #ifdef __cplusplus extern "C" { |