rpc: Use configuration header file

Update #3375.
2018-09-10 06:27:10 +02:00
parent f004b2b8dc
commit e069f7fe56
39 changed files with 115 additions and 4 deletions
--- 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 \
--- 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
--- 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
--- 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
--- 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 $	*/

 /*
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/cpukit/librpc/src/rpc/rtems-rpc-config.h
+++ 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_ */
--- 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
--- 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
 */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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