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)

diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 0f8546004919c430507c09ced9294c4b582c1132..778d3e72c647b57e6a90c911c40139090ffbf4e6 100644 (file)
--- 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 b011e784d04dc568d4f53498bec423cbadb1efbd..5834027899ad5f13fce3e2c32acb6b0e0c3a6215 100644 (file)
--- 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 f3c11e7da3e52cec3116bf4d2a7880ab09d676e8..c8d4177fd278b2829a198c915919ac5f184f670d 100644 (file)
--- 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 802191707795f6e399d5d9c294c6fb19841d7db9..d0a5a6d6c7c72eb53d22d9422214367b21ae774d 100644 (file)
--- 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 5bb0832e75d73a708e0f6317c8e1576169fc9fba..855c3c478dea0d78ac75082f5bab5f7bbc7ed4d4 100644 (file)
--- 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 f62184c52e990ae127d66939facfd7b5ed9e2b3b..c7a9b8faa7954dd0c06b4851c644375001990246 100644 (file)
--- 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 4bd3ec6ca396e52cddf085b825ff5cd7e8c67554..1f2b5231fcea6a4bc0abf8fe5e28050d652cb9a8 100644 (file)
--- 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 a2e2eaa247c2cd12621b5766805ceb959020f8a6..65ab60cd8456fe4cfbaeaa6dd1fb49c8789304a2 100644 (file)
--- 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 f2043aa85b0223450bbea02425cf220a502b736b..4c305784472f8bbcd05f4952dd01934d8d7c2175 100644 (file)
--- 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 278945f9e02080f444ae3b229e7865cf4f5fe475..c0fde1125b053e2ea30bc6bd70c9ecbeedf6c5bd 100644 (file)
--- 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" {