[src/trunk]: src Avoid recursion with traditional cpp.

[kleink <kleink%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/611cc0d1b53e
branches:  trunk
changeset: 495448:611cc0d1b53e
user:      kleink <kleink%NetBSD.org@localhost>
date:      Fri Jul 28 09:33:28 2000 +0000

description:
Avoid recursion with traditional cpp.

diffstat:

 include/netdb.h  |  4 ++--
 include/stdio.h  |  4 ++--
 sys/sys/mman.h   |  6 +++---
 sys/sys/socket.h |  6 +++---
 sys/sys/types.h  |  6 +++---
 sys/sys/un.h     |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diffs (128 lines):

diff -r a36d5a1d69dd -r 611cc0d1b53e include/netdb.h
--- a/include/netdb.h   Fri Jul 28 06:10:54 2000 +0000
+++ b/include/netdb.h   Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netdb.h,v 1.18 2000/06/04 08:51:23 itojun Exp $        */
+/*     $NetBSD: netdb.h,v 1.19 2000/07/28 09:38:15 kleink Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -248,7 +248,7 @@
 #include <sys/ansi.h>
 #ifndef socklen_t
 typedef __socklen_t    socklen_t;
-#define socklen_t      socklen_t
+#define socklen_t      __socklen_t
 #endif
 
 __BEGIN_DECLS
diff -r a36d5a1d69dd -r 611cc0d1b53e include/stdio.h
--- a/include/stdio.h   Fri Jul 28 06:10:54 2000 +0000
+++ b/include/stdio.h   Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stdio.h,v 1.37 2000/07/23 19:25:58 mycroft Exp $       */
+/*     $NetBSD: stdio.h,v 1.38 2000/07/28 09:38:15 kleink Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -335,7 +335,7 @@
     (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE)
 #ifndef        off_t
 typedef        __off_t         off_t;
-#define        off_t           off_t
+#define        off_t           __off_t
 #endif /* off_t */
 
 __BEGIN_DECLS
diff -r a36d5a1d69dd -r 611cc0d1b53e sys/sys/mman.h
--- a/sys/sys/mman.h    Fri Jul 28 06:10:54 2000 +0000
+++ b/sys/sys/mman.h    Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mman.h,v 1.25 2000/06/26 16:54:38 kleink Exp $ */
+/*     $NetBSD: mman.h,v 1.26 2000/07/28 09:33:28 kleink Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1993
@@ -51,12 +51,12 @@
 
 #ifndef        mode_t
 typedef        __mode_t        mode_t
-#define        mode_t          mode_t
+#define        mode_t          __mode_t
 #endif
 
 #ifndef        off_t
 typedef        __off_t         off_t;          /* file offset */
-#define        off_t           off_t
+#define        off_t           __off_t
 #endif
 
 
diff -r a36d5a1d69dd -r 611cc0d1b53e sys/sys/socket.h
--- a/sys/sys/socket.h  Fri Jul 28 06:10:54 2000 +0000
+++ b/sys/sys/socket.h  Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.h,v 1.57 2000/07/05 02:47:23 christos Exp $     */
+/*     $NetBSD: socket.h,v 1.58 2000/07/28 09:33:28 kleink Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -78,12 +78,12 @@
 
 #ifndef sa_family_t
 typedef __sa_family_t  sa_family_t;
-#define sa_family_t    sa_family_t
+#define sa_family_t    __sa_family_t
 #endif
 
 #ifndef socklen_t
 typedef __socklen_t    socklen_t;
-#define socklen_t      socklen_t
+#define socklen_t      __socklen_t
 #endif
 
 /*
diff -r a36d5a1d69dd -r 611cc0d1b53e sys/sys/types.h
--- a/sys/sys/types.h   Fri Jul 28 06:10:54 2000 +0000
+++ b/sys/sys/types.h   Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.45 2000/06/26 16:53:47 kleink Exp $        */
+/*     $NetBSD: types.h,v 1.46 2000/07/28 09:33:28 kleink Exp $        */
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -85,14 +85,14 @@
 
 #ifndef        mode_t
 typedef        __mode_t        mode_t;         /* permissions */
-#define        mode_t          mode_t
+#define        mode_t          __mode_t
 #endif
 
 typedef        u_int32_t       nlink_t;        /* link count */
 
 #ifndef        off_t
 typedef        __off_t         off_t;          /* file offset */
-#define        off_t           off_t
+#define        off_t           __off_t
 #endif
 
 typedef        int32_t         pid_t;          /* process id */
diff -r a36d5a1d69dd -r 611cc0d1b53e sys/sys/un.h
--- a/sys/sys/un.h      Fri Jul 28 06:10:54 2000 +0000
+++ b/sys/sys/un.h      Fri Jul 28 09:33:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: un.h,v 1.24 2000/06/26 15:48:21 kleink Exp $   */
+/*     $NetBSD: un.h,v 1.25 2000/07/28 09:33:29 kleink Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -42,7 +42,7 @@
 
 #ifndef sa_family_t
 typedef __sa_family_t  sa_family_t;
-#define sa_family_t    sa_family_t
+#define sa_family_t    __sa_family_t
 #endif
 
 /*