summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nt/ChangeLog6
-rw-r--r--nt/config.nt2
-rw-r--r--nt/inc/unistd.h2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32proc.c12
5 files changed, 25 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index c915ee40bb6..d34d23df4d5 100644
--- 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 4dc7ede188b..ed1cddf1e12 100644
--- 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 7db6cf08bea..383bc3decec 100644
--- 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 4dc18b6909b..e762eb13b87 100644
--- 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 a0ff96e593c..adef7651b8c 100644
--- 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.