Mon Oct 21 22:00:44 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>

	* argp.h: Add extern inline protection.
	* idvec.h: Likewise.
	* maptime.h: Likewise.
	* argp.c, idvec-funcs.c, maptime-funcs.c: New files.
	* Makefile (SRCS): Add argp.c, idvec-funcs.c, and
	maptime-funcs.c.

8 files changed, 38 insertions, 6 deletions

diff --git a/libshouldbeinlibc/ChangeLog b/libshouldbeinlibc/ChangeLog
index 2a162507..5b12e7f3 100644
--- a/libshouldbeinlibc/ChangeLog
+++ b/libshouldbeinlibc/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 21 22:00:44 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* argp.h: Add extern inline protection.
+	* idvec.h: Likewise.
+	* maptime.h: Likewise.
+	* argp.c, idvec-funcs.c, maptime-funcs.c: New files.
+	* Makefile (SRCS): Add argp.c, idvec-funcs.c, and
+	maptime-funcs.c. 
+
 Mon Oct 14 18:06:19 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* argp-parse.c (argp_parse): Don't consume non-option arguments
diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile
index 9030011e..f1ecf74e 100644
--- a/libshouldbeinlibc/Makefile
+++ b/libshouldbeinlibc/Makefile
@@ -23,7 +23,8 @@ libname = libshouldbeinlibc
 SRCS = argp-parse.c argp-help.c argp-pv.c argp-pvh.c argp-ba.c \
 	termsize.c idvec.c idvec-auth.c timefmt.c exec-reauth.c \
 	canon-host.c maptime.c shared-dom.c localhost.c wire.c portinfo.c \
-	xportinfo.c portxlate.c lcm.c cacheq.c fsysops.c
+	xportinfo.c portxlate.c lcm.c cacheq.c fsysops.c argp.c \
+	idvec-funcs.c maptime-funcs.c
 LCLHDRS = argp.h idvec.h timefmt.h maptime.h \
 	wire.h portinfo.h portxlate.h cacheq.h
 installhdrs = $(LCLHDRS)
diff --git a/libshouldbeinlibc/argp.c b/libshouldbeinlibc/argp.c
new file mode 100644
index 00000000..8e00b7d7
--- /dev/null
+++ b/libshouldbeinlibc/argp.c
@@ -0,0 +1,2 @@
+#define ARGP_EI
+#include "argp.h"
diff --git a/libshouldbeinlibc/argp.h b/libshouldbeinlibc/argp.h
index 75aec1c9..8da5e10b 100644
--- a/libshouldbeinlibc/argp.h
+++ b/libshouldbeinlibc/argp.h
@@ -27,6 +27,11 @@
 #include <errno.h>
 #include <ctype.h>
 #include <getopt.h>
+
+#ifndef ARGP_EI
+#define ARGP_EI extern inline
+#endif
+
 
 /* A description of a particular option.  A pointer to an array of
    these is passed in the OPTIONS field of an argp structure.  Each option
@@ -327,7 +332,7 @@ extern void argp_help (const struct argp *argp, FILE *stream, unsigned flags,
 void argp_state_help (struct argp_state *state, FILE *stream, unsigned flags);
 
 /* Possibly output the standard usage message for ARGP to stderr and exit.  */
-extern inline void
+ARGP_EI void
 argp_usage (struct argp_state *state)
 {
   argp_state_help (state, stderr, ARGP_HELP_STD_USAGE);
@@ -352,7 +357,7 @@ void argp_failure (struct argp_state *state,
      __attribute__ ((format (printf, 4, 5)));
 
 /* Returns true if the option OPT is a valid short option.  */
-extern inline int
+ARGP_EI int
 _option_is_short (const struct argp_option *opt)
 {
   int key = opt->key;
@@ -361,7 +366,7 @@ _option_is_short (const struct argp_option *opt)
 
 /* Returns true if the option OPT is in fact the last (unused) entry in an
    options array.  */
-extern inline int
+ARGP_EI int
 _option_is_end (const struct argp_option *opt)
 {
   return !opt->key && !opt->name && !opt->doc && !opt->group;
diff --git a/libshouldbeinlibc/idvec-funcs.c b/libshouldbeinlibc/idvec-funcs.c
new file mode 100644
index 00000000..1bc6d85f
--- /dev/null
+++ b/libshouldbeinlibc/idvec-funcs.c
@@ -0,0 +1,2 @@
+#define IDVEC_EI
+#include "idvec.h"
diff --git a/libshouldbeinlibc/idvec.h b/libshouldbeinlibc/idvec.h
index 8e99d433..efef22f5 100644
--- a/libshouldbeinlibc/idvec.h
+++ b/libshouldbeinlibc/idvec.h
@@ -25,6 +25,10 @@
 #include <errno.h>
 #include <hurd/hurd_types.h>
 
+#ifndef IDVEC_EI
+#define IDVEC_EI extern inline
+#endif
+
 struct idvec
 {
   uid_t *ids;
@@ -44,7 +48,7 @@ void idvec_free_wrapper (struct idvec *idvec);
 void idvec_free (struct idvec *idvec);
 
 /* Mark IDVEC as not containing any ids.  */
-extern inline void
+IDVEC_EI void
 idvec_clear (struct idvec *idvec)
 {
   idvec->num = 0;
diff --git a/libshouldbeinlibc/maptime-funcs.c b/libshouldbeinlibc/maptime-funcs.c
new file mode 100644
index 00000000..eeac3b3e
--- /dev/null
+++ b/libshouldbeinlibc/maptime-funcs.c
@@ -0,0 +1,5 @@
+#define MAPTIME_EI
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include "maptime.h"
diff --git a/libshouldbeinlibc/maptime.h b/libshouldbeinlibc/maptime.h
index 244cbcf1..948d4de1 100644
--- a/libshouldbeinlibc/maptime.h
+++ b/libshouldbeinlibc/maptime.h
@@ -21,6 +21,10 @@
 #ifndef __MAPTIME_H__
 #define __MAPTIME_H__
 
+#ifndef MAPTIME_EI
+#define MAPTIME_EI extern inline
+#endif
+
 #include <mach/time_value.h>
 
 /* Return the mach mapped time page in MTIME.  If USE_MACH_DEV is false, then
@@ -32,7 +36,7 @@ error_t maptime_map (int use_mach_dev, char *dev_name,
 		     volatile struct mapped_time_value **mtime);
 
 /* Read the current time from MTIME into TV.  This should be very fast.  */
-static inline void
+MAPTIME_EI void
 maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv)
 {
   do