Fix MS-Windows build broken by fixing bug #12776 on Posix platforms.

 src/w32proc.c (getpgrp, setpgid): New functions.

 nt/inc/unistd.h (setpgid, getpgrp): Provide prototypes.
 nt/config.nt (GETPGRP_VOID): Define to 1.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index c915ee40bb6cad6c9f263977eb7c094d4e8bdd65..d34d23df4d56d2b8cdb4143acec68fa162de2b82 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * inc/unistd.h (setpgid, getpgrp): Provide prototypes.  (Bug#12776)
+
+       * config.nt (GETPGRP_VOID): Define to 1.
+
 2012-10-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * config.nt: Sync with autogen/config.in.

diff --git a/nt/config.nt b/nt/config.nt
index 4dc7ede188b157a96a18d7941f52cb1d9244b366..ed1cddf1e129ff74b891f77fc1c056dfa3b54f3a 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -184,7 +184,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define GC_SETJMP_WORKS 1
 
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
-#undef GETPGRP_VOID
+#define GETPGRP_VOID 1
 
 /* Define if gettimeofday clobbers the localtime buffer. */
 #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME

diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index 7db6cf08bea496a5d5875d546d902d5ce48e36b1..383bc3dececd54a4c982e6f1c9f7a9e3237e6e6c 100644 (file)
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -10,5 +10,7 @@
 
 extern ssize_t readlink (const char *, char *, size_t);
 extern int symlink (char const *, char const *);
+extern int setpgid (pid_t, pid_t);
+extern pid_t getpgrp (void);
 
 #endif /* _UNISTD_H */

diff --git a/src/ChangeLog b/src/ChangeLog
index 4dc18b6909ba9740417d10365f7e835602a16114..e762eb13b87b401633bda790c1126d8c93be7676 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32proc.c (getpgrp, setpgid): New functions.  (Bug#12776)
+
 2012-10-31  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix crash when using Emacs as commit editor for git (Bug#12697).

diff --git a/src/w32proc.c b/src/w32proc.c
index a0ff96e593c73f86dcefb0b73d4f21b32dcdcea3..adef7651b8ce50097d790256ba10bed2477f361e 100644 (file)
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -236,6 +236,18 @@ setpgrp (int pid, int gid)
   return 0;
 }
 
+pid_t
+getpgrp (void)
+{
+  return getpid ();
+}
+
+int
+setpgid (pid_t pid, pid_t pgid)
+{
+  return 0;
+}
+
 /* Emulations of interval timers.
 
    Limitations: only ITIMER_REAL and ITIMER_PROF are supported.