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 0f85460..778d3e7 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
 
 #define __NAMESER      19991006
 #define NS_PACKETSZ    512

diff --git a/include/elf.h b/include/elf.h
index b011e78..5834027 100644 (file)
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,5 +1,5 @@
 #ifndef _ELF_H
 #ifndef _ELF_H

-#define        _ELF_H 1
+#define _ELF_H

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/net/ethernet.h b/include/net/ethernet.h
index f3c11e7..c8d4177 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" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/paths.h b/include/paths.h
index 8021917..d0a5a6d 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"
 
 #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 5bb0832..855c3c4 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>
 
 #include <stdint.h>
 #include <arpa/nameser.h>

diff --git a/include/sys/fsuid.h b/include/sys/fsuid.h
index f62184c..c7a9b8f 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" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h
index 4bd3ec6..1f2b523 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" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index a2e2eaa..65ab60c 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)
 
 #define major(x) (((x) >> 8) & 0xff)
 #define minor(x) ((x) & 0xff)

diff --git a/include/syscall.h b/include/syscall.h
index f2043aa..4c30578 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 278945f..c0fde11 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" {
 
 #ifdef __cplusplus
 extern "C" {