rpc: Use configuration header file

Update #3375.

39 files changed, 115 insertions, 4 deletions

diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index eb498287fa..b0af51bf70 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -19,7 +19,7 @@ if LIBNETWORKING
 man_MANS += $(libxdr_mans)
 
 noinst_LIBRARIES += librpc.a
-librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(librpc_CPPFLAGS)
+librpc_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \
     src/rpc/authunix_prot.c src/rpc/bindresvport.c src/rpc/clnt_generic.c \
@@ -34,9 +34,6 @@ librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \
     src/rpc/svc_raw.c src/rpc/svc_run.c src/rpc/svc_simple.c \
     src/rpc/svc_tcp.c src/rpc/svc_udp.c src/rpc/rtems_portmapper.c \
     src/rpc/rtems_rpc.c
-
-librpc_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \
-    -D_RTEMS_RPC_INTERNAL_
 endif
 
 librpc_mans = src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \
diff --git a/cpukit/librpc/src/rpc/auth_none.c b/cpukit/librpc/src/rpc/auth_none.c
index 48b3741df7..535749ccb0 100644
--- a/cpukit/librpc/src/rpc/auth_none.c
+++ b/cpukit/librpc/src/rpc/auth_none.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/auth_unix.c b/cpukit/librpc/src/rpc/auth_unix.c
index 67d3962bae..99f5920d09 100644
--- a/cpukit/librpc/src/rpc/auth_unix.c
+++ b/cpukit/librpc/src/rpc/auth_unix.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/authunix_prot.c b/cpukit/librpc/src/rpc/authunix_prot.c
index 84acf46c6b..9dc867aec5 100644
--- a/cpukit/librpc/src/rpc/authunix_prot.c
+++ b/cpukit/librpc/src/rpc/authunix_prot.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/bindresvport.c b/cpukit/librpc/src/rpc/bindresvport.c
index 849d664f33..1c979de4a3 100644
--- a/cpukit/librpc/src/rpc/bindresvport.c
+++ b/cpukit/librpc/src/rpc/bindresvport.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*	$NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $	*/
 
 /*
diff --git a/cpukit/librpc/src/rpc/clnt_generic.c b/cpukit/librpc/src/rpc/clnt_generic.c
index 232af02cd7..6d97dfb5d5 100644
--- a/cpukit/librpc/src/rpc/clnt_generic.c
+++ b/cpukit/librpc/src/rpc/clnt_generic.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/clnt_perror.c b/cpukit/librpc/src/rpc/clnt_perror.c
index 1d2cfc0b40..121ebc96b7 100644
--- a/cpukit/librpc/src/rpc/clnt_perror.c
+++ b/cpukit/librpc/src/rpc/clnt_perror.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/clnt_raw.c b/cpukit/librpc/src/rpc/clnt_raw.c
index c522cecc7e..86826221da 100644
--- a/cpukit/librpc/src/rpc/clnt_raw.c
+++ b/cpukit/librpc/src/rpc/clnt_raw.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/clnt_simple.c b/cpukit/librpc/src/rpc/clnt_simple.c
index 3cf17b4350..6767a78dcf 100644
--- a/cpukit/librpc/src/rpc/clnt_simple.c
+++ b/cpukit/librpc/src/rpc/clnt_simple.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/clnt_tcp.c b/cpukit/librpc/src/rpc/clnt_tcp.c
index c85531d5c9..b7ccd5ada7 100644
--- a/cpukit/librpc/src/rpc/clnt_tcp.c
+++ b/cpukit/librpc/src/rpc/clnt_tcp.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/clnt_udp.c b/cpukit/librpc/src/rpc/clnt_udp.c
index e48508ba61..93befc25d0 100644
--- a/cpukit/librpc/src/rpc/clnt_udp.c
+++ b/cpukit/librpc/src/rpc/clnt_udp.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/get_myaddress.c b/cpukit/librpc/src/rpc/get_myaddress.c
index 2dae64cdcf..a3410e9511 100644
--- a/cpukit/librpc/src/rpc/get_myaddress.c
+++ b/cpukit/librpc/src/rpc/get_myaddress.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/getrpcent.c b/cpukit/librpc/src/rpc/getrpcent.c
index fdd0f88ec2..a980c7d41f 100644
--- a/cpukit/librpc/src/rpc/getrpcent.c
+++ b/cpukit/librpc/src/rpc/getrpcent.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/getrpcport.c b/cpukit/librpc/src/rpc/getrpcport.c
index f783bac29b..f1fa5a3040 100644
--- a/cpukit/librpc/src/rpc/getrpcport.c
+++ b/cpukit/librpc/src/rpc/getrpcport.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/netname.c b/cpukit/librpc/src/rpc/netname.c
index e75ef73725..fd1145cbf2 100644
--- a/cpukit/librpc/src/rpc/netname.c
+++ b/cpukit/librpc/src/rpc/netname.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/netnamer.c b/cpukit/librpc/src/rpc/netnamer.c
index aa9397e03c..841f6b1806 100644
--- a/cpukit/librpc/src/rpc/netnamer.c
+++ b/cpukit/librpc/src/rpc/netnamer.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_clnt.c b/cpukit/librpc/src/rpc/pmap_clnt.c
index 7c02867ea2..7aab450f20 100644
--- a/cpukit/librpc/src/rpc/pmap_clnt.c
+++ b/cpukit/librpc/src/rpc/pmap_clnt.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_getmaps.c b/cpukit/librpc/src/rpc/pmap_getmaps.c
index 78179ff64e..1645c5d2c2 100644
--- a/cpukit/librpc/src/rpc/pmap_getmaps.c
+++ b/cpukit/librpc/src/rpc/pmap_getmaps.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_getport.c b/cpukit/librpc/src/rpc/pmap_getport.c
index 9970712f80..9a289378f9 100644
--- a/cpukit/librpc/src/rpc/pmap_getport.c
+++ b/cpukit/librpc/src/rpc/pmap_getport.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_prot.c b/cpukit/librpc/src/rpc/pmap_prot.c
index 30aedce444..33b0d0da51 100644
--- a/cpukit/librpc/src/rpc/pmap_prot.c
+++ b/cpukit/librpc/src/rpc/pmap_prot.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_prot2.c b/cpukit/librpc/src/rpc/pmap_prot2.c
index 208c8a412a..c61eab5aee 100644
--- a/cpukit/librpc/src/rpc/pmap_prot2.c
+++ b/cpukit/librpc/src/rpc/pmap_prot2.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/pmap_rmt.c b/cpukit/librpc/src/rpc/pmap_rmt.c
index c7d36b0887..5576c87264 100644
--- a/cpukit/librpc/src/rpc/pmap_rmt.c
+++ b/cpukit/librpc/src/rpc/pmap_rmt.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rpc_callmsg.c b/cpukit/librpc/src/rpc/rpc_callmsg.c
index b44ebb4a36..2d340ba8fe 100644
--- a/cpukit/librpc/src/rpc/rpc_callmsg.c
+++ b/cpukit/librpc/src/rpc/rpc_callmsg.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rpc_commondata.c b/cpukit/librpc/src/rpc/rpc_commondata.c
index ad22568446..cae9d21e54 100644
--- a/cpukit/librpc/src/rpc/rpc_commondata.c
+++ b/cpukit/librpc/src/rpc/rpc_commondata.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rpc_dtablesize.c b/cpukit/librpc/src/rpc/rpc_dtablesize.c
index a102accefa..d19cc049cd 100644
--- a/cpukit/librpc/src/rpc/rpc_dtablesize.c
+++ b/cpukit/librpc/src/rpc/rpc_dtablesize.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rpc_prot.c b/cpukit/librpc/src/rpc/rpc_prot.c
index 0718c9a990..ea4787edb7 100644
--- a/cpukit/librpc/src/rpc/rpc_prot.c
+++ b/cpukit/librpc/src/rpc/rpc_prot.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rpcdname.c b/cpukit/librpc/src/rpc/rpcdname.c
index 6482a74493..2451d63c2d 100644
--- a/cpukit/librpc/src/rpc/rpcdname.c
+++ b/cpukit/librpc/src/rpc/rpcdname.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rtems-rpc-config.h b/cpukit/librpc/src/rpc/rtems-rpc-config.h
new file mode 100644
index 0000000000..9448ab742d
--- /dev/null
+++ b/cpukit/librpc/src/rpc/rtems-rpc-config.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _RTEMS_RPC_CONFIG_H_
+#define	_RTEMS_RPC_CONFIG_H_
+
+#define	_RPC_read		read
+#define	_RPC_write		write
+#define	_RPC_close		close
+#define	_RTEMS_RPC_INTERNAL_
+
+#endif /* _RTEMS_RPC_CONFIG_H_ */
diff --git a/cpukit/librpc/src/rpc/rtems_portmapper.c b/cpukit/librpc/src/rpc/rtems_portmapper.c
index 11724c1508..8118482775 100644
--- a/cpukit/librpc/src/rpc/rtems_portmapper.c
+++ b/cpukit/librpc/src/rpc/rtems_portmapper.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/rtems_rpc.c b/cpukit/librpc/src/rpc/rtems_rpc.c
index b1efb61e66..91e2b0fcf3 100644
--- a/cpukit/librpc/src/rpc/rtems_rpc.c
+++ b/cpukit/librpc/src/rpc/rtems_rpc.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * RTEMS multi-tasking support
  */
diff --git a/cpukit/librpc/src/rpc/rtime.c b/cpukit/librpc/src/rpc/rtime.c
index af63d5b8e4..4a77084027 100644
--- a/cpukit/librpc/src/rpc/rtime.c
+++ b/cpukit/librpc/src/rpc/rtime.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc.c b/cpukit/librpc/src/rpc/svc.c
index 64cc964c71..a1f576976c 100644
--- a/cpukit/librpc/src/rpc/svc.c
+++ b/cpukit/librpc/src/rpc/svc.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_auth.c b/cpukit/librpc/src/rpc/svc_auth.c
index b498a9c0dd..0bee5175d9 100644
--- a/cpukit/librpc/src/rpc/svc_auth.c
+++ b/cpukit/librpc/src/rpc/svc_auth.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_auth_unix.c b/cpukit/librpc/src/rpc/svc_auth_unix.c
index ce395998bd..0dccc4747b 100644
--- a/cpukit/librpc/src/rpc/svc_auth_unix.c
+++ b/cpukit/librpc/src/rpc/svc_auth_unix.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_raw.c b/cpukit/librpc/src/rpc/svc_raw.c
index 4685370e7a..f3a6f57967 100644
--- a/cpukit/librpc/src/rpc/svc_raw.c
+++ b/cpukit/librpc/src/rpc/svc_raw.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_run.c b/cpukit/librpc/src/rpc/svc_run.c
index 963aa0d80b..fc57fe2612 100644
--- a/cpukit/librpc/src/rpc/svc_run.c
+++ b/cpukit/librpc/src/rpc/svc_run.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_simple.c b/cpukit/librpc/src/rpc/svc_simple.c
index 30f213db83..9f4b8fdf78 100644
--- a/cpukit/librpc/src/rpc/svc_simple.c
+++ b/cpukit/librpc/src/rpc/svc_simple.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_tcp.c b/cpukit/librpc/src/rpc/svc_tcp.c
index 0f87080b74..1827d1fcda 100644
--- a/cpukit/librpc/src/rpc/svc_tcp.c
+++ b/cpukit/librpc/src/rpc/svc_tcp.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/cpukit/librpc/src/rpc/svc_udp.c b/cpukit/librpc/src/rpc/svc_udp.c
index bb99f4a350..94444c455f 100644
--- a/cpukit/librpc/src/rpc/svc_udp.c
+++ b/cpukit/librpc/src/rpc/svc_udp.c
@@ -1,3 +1,5 @@
+#include "rtems-rpc-config.h"
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape