about summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
Diffstat (limited to 'string')
-rw-r--r--string/argz.h4
-rw-r--r--string/endian.h3
-rw-r--r--string/envz.h6
-rw-r--r--string/memory.h2
-rw-r--r--string/string.h2
-rw-r--r--string/strings.h2
6 files changed, 10 insertions, 9 deletions
diff --git a/string/argz.h b/string/argz.h
index 0126235b8f..71e94c9167 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -17,9 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef __ARGZ_H__
+#ifndef _ARGZ_H
+#define _ARGZ_H	1
 
-#define __ARGZ_H__	1
 #include <features.h>
 
 #define __need_error_t
diff --git a/string/endian.h b/string/endian.h
index 593b419637..338c42ec35 100644
--- a/string/endian.h
+++ b/string/endian.h
@@ -18,6 +18,7 @@
 
 #ifndef	_ENDIAN_H
 #define	_ENDIAN_H	1
+
 #include <features.h>
 
 /* Definitions for byte order, according to significance of bytes, from low
@@ -31,7 +32,7 @@
 #define	__PDP_ENDIAN	3412
 
 /* This file defines `__BYTE_ORDER' for the particular machine.  */
-#include <bytesex.h>
+#include <bits/endian.h>
 
 #ifdef	__USE_BSD
 #define	LITTLE_ENDIAN	__LITTLE_ENDIAN
diff --git a/string/envz.h b/string/envz.h
index 23aaed6119..dc6f55725d 100644
--- a/string/envz.h
+++ b/string/envz.h
@@ -17,9 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef __ENVZ_H__
+#ifndef _ENVZ_H
+#define _ENVZ_H	1
 
-#define __ENVZ_H__	1
 #include <features.h>
 
 #include <errno.h>
@@ -60,4 +60,4 @@ extern void envz_strip __P ((char **__envz, size_t *__envz_len));
 
 __END_DECLS
 
-#endif /* __ENVZ_H__ */
+#endif /* envz.h */
diff --git a/string/memory.h b/string/memory.h
index a7634fe90b..952060d431 100644
--- a/string/memory.h
+++ b/string/memory.h
@@ -21,8 +21,8 @@
  */
 
 #ifndef	_MEMORY_H
-
 #define	_MEMORY_H	1
+
 #include <features.h>
 
 
diff --git a/string/string.h b/string/string.h
index 24beb6caa2..f790a246f9 100644
--- a/string/string.h
+++ b/string/string.h
@@ -21,8 +21,8 @@
  */
 
 #ifndef	_STRING_H
-
 #define	_STRING_H	1
+
 #include <features.h>
 
 __BEGIN_DECLS
diff --git a/string/strings.h b/string/strings.h
index f8ede2966c..701132992a 100644
--- a/string/strings.h
+++ b/string/strings.h
@@ -19,8 +19,8 @@
 /* Compatibility with BSD string(3).  */
 
 #ifndef	_STRINGS_H
-
 #define	_STRINGS_H	1
+
 #include <features.h>