From 561c7995d7524afbf92689593b9ba5f9615d0982 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 2 Apr 2003 01:10:44 +0000
Subject: [PATCH] 2003-04-01  Philippe De Muyter  <phdm@macqel.be>

	* sock.c, stream.c: Check #ifdef LINUX, not linux.
	* file.c: Always provide sys_*attr, regardless of #ifdef XATTR_CREATE.
---
 file.c   | 6 ++----
 sock.c   | 2 +-
 stream.c | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/file.c b/file.c
index a8aecf5d..1706c6a2 100644
--- a/file.c
+++ b/file.c
@@ -2156,11 +2156,11 @@ struct tcb *tcp;
 
 #endif /* HAVE_SYS_ASYNCH_H */
 
-#ifdef XATTR_CREATE
-
 struct xlat xattrflags[] = {
+#ifdef XATTR_CREATE
 	{ XATTR_CREATE,	 "XATTR_CREATE" },
 	{ XATTR_REPLACE, "XATTR_REPLACE" },
+#endif
 	{ 0,		 NULL }
 };
 
@@ -2270,5 +2270,3 @@ struct tcb *tcp;
     }
     return 0;
 }
-
-#endif
diff --git a/sock.c b/sock.c
index 6d494b7e..aa0bf88d 100644
--- a/sock.c
+++ b/sock.c
@@ -29,7 +29,7 @@
 
 #include "defs.h"
 
-#ifdef linux
+#ifdef LINUX
 #include <sys/socket.h>
 #else
 #include <sys/sockio.h>
diff --git a/stream.c b/stream.c
index 135735a6..3dac2826 100644
--- a/stream.c
+++ b/stream.c
@@ -50,7 +50,7 @@
 #include <sys/tihdr.h>
 #endif
 
-#if defined(HAVE_SYS_STREAM_H) || defined(linux) || defined(FREEBSD)
+#if defined(HAVE_SYS_STREAM_H) || defined(LINUX) || defined(FREEBSD)
 
 #ifndef HAVE_STROPTS_H
 #define RS_HIPRI 1
@@ -367,7 +367,7 @@ struct tcb *tcp;
 }
 #endif
 
-#if !defined(linux) && !defined(FREEBSD)
+#if !defined(LINUX) && !defined(FREEBSD)
 
 static struct xlat stream_flush_options[] = {
 	{ FLUSHR,	"FLUSHR"	},
@@ -1296,6 +1296,6 @@ int code, arg;
 	}
 }
 
-#endif /* !linux && !FREEBSD */
+#endif /* !LINUX && !FREEBSD */
 
-#endif /* HAVE_SYS_STREAM_H || linux || FREEBSD */
+#endif /* HAVE_SYS_STREAM_H || LINUX || FREEBSD */
-- 
2.40.0