diff options
-rw-r--r-- | c/src/exec/libnetworking/rtems/rtems_bsdnet.h | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/network/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libchip/network/Makefile.in | 3 | ||||
-rw-r--r-- | c/src/lib/libnetworking/rtems/rtems_bsdnet.h | 22 | ||||
-rw-r--r-- | c/src/lib/libnetworking/rtems_servers/Makefile.in | 3 |
10 files changed, 52 insertions, 16 deletions
diff --git a/c/src/exec/libnetworking/rtems/rtems_bsdnet.h b/c/src/exec/libnetworking/rtems/rtems_bsdnet.h index 6447749f80..3152099525 100644 --- a/c/src/exec/libnetworking/rtems/rtems_bsdnet.h +++ b/c/src/exec/libnetworking/rtems/rtems_bsdnet.h @@ -8,6 +8,28 @@ #include <rtems.h> /* + * If this file is included from inside the Network Stack proper or + * a device driver, then __INSIDE_RTEMS_BSD_TCPIP_STACK__ should be + * defined. This triggers a number of internally used definitions. + */ + +#if defined(__INSIDE_RTEMS_BSD_TCPIP_STACK__) +#undef _COMPILING_BSD_KERNEL_ +#undef KERNEL +#undef INET +#undef NFS +#undef DIAGNOSTIC +#undef BOOTP_COMPAT + +#define _COMPILING_BSD_KERNEL_ +#define KERNEL +#define INET +#define NFS +#define DIAGNOSTIC +#define BOOTP_COMPAT +#endif + +/* * Values that may be obtained by BOOTP */ extern struct in_addr rtems_bsdnet_bootp_server_address; diff --git a/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in b/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in index 56a230ecaa..6ebc4bb867 100644 --- a/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in @@ -34,8 +34,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in index 025b1b7b9b..d4ded9e8e3 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in @@ -34,8 +34,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in index 43655d1255..7f7aa53fbb 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in @@ -34,8 +34,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in index d6118b75c2..d1abd70a71 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in @@ -34,8 +34,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in index f4fbf43a59..f370a7d85b 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in @@ -39,8 +39,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in index aee72171c8..8b77009749 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in @@ -34,8 +34,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libchip/network/Makefile.in b/c/src/lib/libchip/network/Makefile.in index e3bfaa3ad3..2946e78a90 100644 --- a/c/src/lib/libchip/network/Makefile.in +++ b/c/src/lib/libchip/network/Makefile.in @@ -35,8 +35,7 @@ include $(RTEMS_ROOT)/make/lib.cfg # Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += $(LIBC_DEFINES) diff --git a/c/src/lib/libnetworking/rtems/rtems_bsdnet.h b/c/src/lib/libnetworking/rtems/rtems_bsdnet.h index 6447749f80..3152099525 100644 --- a/c/src/lib/libnetworking/rtems/rtems_bsdnet.h +++ b/c/src/lib/libnetworking/rtems/rtems_bsdnet.h @@ -8,6 +8,28 @@ #include <rtems.h> /* + * If this file is included from inside the Network Stack proper or + * a device driver, then __INSIDE_RTEMS_BSD_TCPIP_STACK__ should be + * defined. This triggers a number of internally used definitions. + */ + +#if defined(__INSIDE_RTEMS_BSD_TCPIP_STACK__) +#undef _COMPILING_BSD_KERNEL_ +#undef KERNEL +#undef INET +#undef NFS +#undef DIAGNOSTIC +#undef BOOTP_COMPAT + +#define _COMPILING_BSD_KERNEL_ +#define KERNEL +#define INET +#define NFS +#define DIAGNOSTIC +#define BOOTP_COMPAT +#endif + +/* * Values that may be obtained by BOOTP */ extern struct in_addr rtems_bsdnet_bootp_server_address; diff --git a/c/src/lib/libnetworking/rtems_servers/Makefile.in b/c/src/lib/libnetworking/rtems_servers/Makefile.in index 369fc81b8f..02c5f91572 100644 --- a/c/src/lib/libnetworking/rtems_servers/Makefile.in +++ b/c/src/lib/libnetworking/rtems_servers/Makefile.in @@ -33,8 +33,7 @@ include $(RTEMS_ROOT)/make/lib.cfg # Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += CFLAGS += |