Sync to HEAD

18 files changed, 87 insertions, 0 deletions

diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index f0b1e76fbf3..c216231eb46 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -27,3 +27,6 @@ void *__alloca(size_t size);
 #endif
 
 #endif
+
+/* arch-tag: 8d4114d1-633e-49e7-8f18-b5648f9c4511
+   (do not change this comment) */
diff --git a/mac/inc/config.h b/mac/inc/config.h
index beb8c0a6373..b7257f35f35 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -570,3 +570,6 @@ extern char *getenv ();
 /* #define GLYPH_DEBUG 1 */
 
 #define NO_RETURN /* nothing */
+
+/* arch-tag: 2596b649-b569-448e-8880-373d2a9909b7
+   (do not change this comment) */
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index e8d8abb8750..da8d442126e 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -24,3 +24,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #define MAC_OS8 1
 #define MAC_OS 1
+
+/* arch-tag: 4aa4fcea-3a95-433d-a7d6-b029afca17f1
+   (do not change this comment) */
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 59b0c44cc41..5e1b3a66603 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -46,3 +46,6 @@ extern int closedir(DIR *);
 extern struct dirent *readdir(DIR *);
 
 #endif /* _DIRENT_H */
+
+/* arch-tag: ec3116df-70f9-4a4a-b6d0-1858aaa9ea22
+   (do not change this comment) */
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 0ec9da70a2b..8c9bbd2f8ba 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -59,3 +59,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Where Emacs should look for the application default file. */
 /* #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" */
+
+/* arch-tag: 32e95134-dfe4-47be-be28-e8cbf78505b6
+   (do not change this comment) */
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
new file mode 100755
index 00000000000..9c60d5ca2ce
--- /dev/null
+++ b/mac/inc/grp.h
@@ -0,0 +1,36 @@
+/* Replacement grp.h file for building GNU Emacs on the Macintosh.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _GRP_H
+#define _GRP_H
+
+#include <sys/types.h>
+
+/* Emacs uses only gr_name */
+struct group {
+  char *gr_name;	/* group name */
+};
+
+struct group *getgrgid(gid_t);
+
+#endif /* _GRP_H */
+
+/* arch-tag: 3b1d3315-05d5-4c7a-8404-3754bb40020c
+   (do not change this comment) */
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 9e257a3121b..f3f6f084b34 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -138,3 +138,6 @@ Boston, MA 02111-1307, USA.  */
 extern int sign_extend_temp;
 #endif
 #endif
+
+/* arch-tag: 9e759031-ab7b-4c76-99d7-3ae94a98de38
+   (do not change this comment) */
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index dedc8091c45..b5eba307824 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -35,3 +35,6 @@ struct passwd *getpwuid(uid_t);
 struct passwd *getpwnam(const char *);
 
 #endif /* _PWD_H */
+
+/* arch-tag: e169cad7-12ca-4660-a35e-36f80d5d345f
+   (do not change this comment) */
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 35143ddf267..c187944ae6b 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -318,3 +318,6 @@ extern double atof (const char *);
 #define volatile
 
 #define SYMS_SYSTEM syms_of_mac()
+
+/* arch-tag: 6a941c4b-a419-4d25-80ac-9335053e58b2
+   (do not change this comment) */
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index b33f8aaa9cc..0566b63cd58 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -57,3 +57,6 @@ int pause(void);
 char *getwd(char *);
 
 #endif  /* _SYS_FILE_H */
+
+/* arch-tag: c3a653d5-f228-4d62-a47c-0398015195de
+   (do not change this comment) */
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index ae1a76b7a0f..36a921f2a1e 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -29,3 +29,6 @@ int ioctl(int, int, void *);
 #define TCGETA 2
 
 #endif  /* _SYS_IOCTL_H */
+
+/* arch-tag: fa0c3dda-dbe0-4a49-86c4-7516c83c3c8c
+   (do not change this comment) */
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index 247f3971a4c..a0e3c6d6f26 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -26,3 +26,6 @@ Boston, MA 02111-1307, USA.  */
 #define MAXPATHLEN 255
 
 #endif /* _SYS_PARAM_H */
+
+/* arch-tag: dceae288-b9cf-4a8f-a780-bca2cadf0c47
+   (do not change this comment) */
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 0f9ee79dab1..b72385c1b4d 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -84,3 +84,6 @@ struct stat {
 #endif  /* __MRC__ */
 
 #endif /* _SYS_STAT_H */
+
+/* arch-tag: b7da83f5-3d3f-4b19-9cd2-790dd87145e4
+   (do not change this comment) */
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index b9936e92075..b80135b7b5e 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -29,3 +29,6 @@ struct timeval {
 };
 
 #endif  /* _SYS_TYPES_H */
+
+/* arch-tag: f85ed04d-0e99-4f97-892b-fe029d0e92f9
+   (do not change this comment) */
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 9f358b2a4e8..0d647d16c9e 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -38,3 +38,6 @@ typedef unsigned long mode_t;
 #endif  /* __MRC__ */
 
 #endif  /* _SYS_TYPES_H */
+
+/* arch-tag: d4b69a6a-b2ff-4be2-a152-a162af81d823
+   (do not change this comment) */
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 7d423630c93..3996351a79a 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -66,3 +66,6 @@ struct termio {
 #define TCSETAF 5
 
 #endif /* _SYS_TERMIO_H */
+
+/* arch-tag: 0e7a100d-2ac0-412e-9dc4-52e39ef43e14
+   (do not change this comment) */
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 1a7f9253296..a6ce81af1ee 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -35,3 +35,6 @@ struct utimbuf {
 int utime(const char *path, const struct utimbuf *buf);
 
 #endif
+
+/* arch-tag: 52dc3f6b-6122-4568-8f09-a5a56de6a324
+   (do not change this comment) */
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index 0469fcf9eab..e1fe3217ea6 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -30,3 +30,6 @@ struct utsname {
 int uname(struct utsname *name);
 
 #endif
+
+/* arch-tag: 8a013744-4d43-4084-8e2f-d3fb66c83160
+   (do not change this comment) */