[Emacs-diffs] /srv/bzr/emacs/trunk r110763: Fix MS-Windows build broken by fixing bug #12776 on Posix platforms.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110763
fixes bug: http://debbugs.gnu.org/12776
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-01 16:21:45 +0200
message:
  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.
modified:
  nt/ChangeLog
  nt/config.nt
  nt/inc/unistd.h
  src/ChangeLog
  src/w32proc.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-10-24 13:46:38 +0000
+++ b/nt/ChangeLog      2012-11-01 14:21:45 +0000
@@ -1,3 +1,9 @@
+2012-11-01  Eli Zaretskii  <address@hidden>
+
+       * inc/unistd.h (setpgid, getpgrp): Provide prototypes.  (Bug#12776)
+
+       * config.nt (GETPGRP_VOID): Define to 1.
+
 2012-10-24  Juanma Barranquero  <address@hidden>
 
        * config.nt: Sync with autogen/config.in.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-10-24 13:46:38 +0000
+++ b/nt/config.nt      2012-11-01 14:21:45 +0000
@@ -184,7 +184,7 @@
 #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

=== modified file 'nt/inc/unistd.h'
--- a/nt/inc/unistd.h   2012-09-04 17:34:54 +0000
+++ b/nt/inc/unistd.h   2012-11-01 14:21:45 +0000
@@ -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 */

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-31 17:27:29 +0000
+++ b/src/ChangeLog     2012-11-01 14:21:45 +0000
@@ -1,3 +1,7 @@
+2012-11-01  Eli Zaretskii  <address@hidden>
+
+       * w32proc.c (getpgrp, setpgid): New functions.  (Bug#12776)
+
 2012-10-31  Paul Eggert  <address@hidden>
 
        Fix crash when using Emacs as commit editor for git (Bug#12697).

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2012-10-31 19:23:06 +0000
+++ b/src/w32proc.c     2012-11-01 14:21:45 +0000
@@ -236,6 +236,18 @@
   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.