Module Name: src
Committed By: njoly
Date: Mon Jun 8 14:42:10 UTC 2009
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_missing.h linux32_signal.h
linux32_types.h
Log Message:
Fix defines against multiple inclusion protection (s/I386/AMD64).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux32/arch/amd64/linux32_missing.h
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/linux32/arch/amd64/linux32_signal.h
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux32/arch/amd64/linux32_types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux32/arch/amd64/linux32_missing.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_missing.h:1.8 src/sys/compat/linux32/arch/amd64/linux32_missing.h:1.9
--- src/sys/compat/linux32/arch/amd64/linux32_missing.h:1.8 Wed Apr 16 10:03:31 2008
+++ src/sys/compat/linux32/arch/amd64/linux32_missing.h Mon Jun 8 14:42:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_missing.h,v 1.8 2008/04/16 10:03:31 njoly Exp $ */
+/* $NetBSD: linux32_missing.h,v 1.9 2009/06/08 14:42:10 njoly Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -30,8 +30,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _I386_LINUX32_MISSING_H
-#define _I386_LINUX32_MISSING_H
+#ifndef _AMD64_LINUX32_MISSING_H
+#define _AMD64_LINUX32_MISSING_H
#include <compat/netbsd32/netbsd32.h>
#include <compat/linux/common/linux_types.h>
@@ -80,4 +80,4 @@
__END_DECLS
#endif /* !_KERNEL */
-#endif /* _I386_LINUX32_MISSING_H */
+#endif /* _AMD64_LINUX32_MISSING_H */
Index: src/sys/compat/linux32/arch/amd64/linux32_signal.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_signal.h:1.1 src/sys/compat/linux32/arch/amd64/linux32_signal.h:1.2
--- src/sys/compat/linux32/arch/amd64/linux32_signal.h:1.1 Thu Feb 9 19:18:57 2006
+++ src/sys/compat/linux32/arch/amd64/linux32_signal.h Mon Jun 8 14:42:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_signal.h,v 1.1 2006/02/09 19:18:57 manu Exp $ */
+/* $NetBSD: linux32_signal.h,v 1.2 2009/06/08 14:42:10 njoly Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -30,8 +30,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _I386_LINUX32_SIGNAL_H_
-#define _I386_LINUX32_SIGNAL_H_
+#ifndef _AMD64_LINUX32_SIGNAL_H_
+#define _AMD64_LINUX32_SIGNAL_H_
#define native_to_linux32_signo native_to_linux_signo
#define linux32_to_native_signo linux_to_native_signo
@@ -296,4 +296,4 @@
linux32_handler_t sf_handler;
};
-#endif /* _I386_LINUX32_SIGNAL_H_ */
+#endif /* _AMD64_LINUX32_SIGNAL_H_ */
Index: src/sys/compat/linux32/arch/amd64/linux32_types.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_types.h:1.5 src/sys/compat/linux32/arch/amd64/linux32_types.h:1.6
--- src/sys/compat/linux32/arch/amd64/linux32_types.h:1.5 Thu Sep 4 17:45:00 2008
+++ src/sys/compat/linux32/arch/amd64/linux32_types.h Mon Jun 8 14:42:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_types.h,v 1.5 2008/09/04 17:45:00 njoly Exp $ */
+/* $NetBSD: linux32_types.h,v 1.6 2009/06/08 14:42:10 njoly Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -30,8 +30,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _I386_LINUX32_TYPES_H
-#define _I386_LINUX32_TYPES_H
+#ifndef _AMD64_LINUX32_TYPES_H
+#define _AMD64_LINUX32_TYPES_H
typedef unsigned short linux32_uid_t;
typedef unsigned short linux32_gid_t;
@@ -93,4 +93,4 @@
linux32_time_t l_modtime;
};
-#endif /* _I386_LINUX32_TYPES_H */
+#endif /* _AMD64_LINUX32_TYPES_H */
