summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am1
-rw-r--r--makeint.h14
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d75dc5..a2d2796 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-01-20 Paul Smith <psmith@gnu.org>
+ * gnumake.h: New file to contain externally-visible content.
+ * makeint.h: Include gnumake.h. Move gmk_floc type to gnumake.h.
+ * Makefile.am (include_HEADERS): Install the gnumake.h header.
+
* makeint.h: Change struct floc to gmk_floc typedef.
* Many: Use the new typedef.
diff --git a/Makefile.am b/Makefile.am
index 5507750..3e3b480 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ endif
SUBDIRS = glob config po doc $(MAYBE_W32)
bin_PROGRAMS = make
+include_HEADERS = gnumake.h
if USE_CUSTOMS
remote = remote-cstms.c
diff --git a/makeint.h b/makeint.h
index 920ea07..6f2ee67 100644
--- a/makeint.h
+++ b/makeint.h
@@ -47,6 +47,9 @@ char *alloca ();
# define NDEBUG 1
#endif
+/* Include the externally-visible content.
+ Be sure to use the local one, and not one installed on the system. */
+#include "gnumake.h"
#ifdef CRAY
/* This must happen before #include <signal.h> so
@@ -362,11 +365,6 @@ extern int unixy_shell;
extern struct rlimit stack_limit;
#endif
-typedef struct
- {
- const char *filenm;
- unsigned long lineno;
- } gmk_floc;
#define NILF ((gmk_floc *)0)
#define CSTRLEN(_s) (sizeof (_s)-1)
@@ -424,9 +422,9 @@ int ar_touch (const char *);
time_t ar_member_date (const char *);
typedef long int (*ar_member_func_t) (int desc, const char *mem, int truncated,
- long int hdrpos, long int datapos,
- long int size, long int date, int uid,
- int gid, int mode, const void *arg);
+ long int hdrpos, long int datapos,
+ long int size, long int date, int uid,
+ int gid, int mode, const void *arg);
long int ar_scan (const char *archive, ar_member_func_t function, const void *arg);
int ar_name_equal (const char *name, const char *mem, int truncated);