aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-01 16:21:45 +0200
committerEli Zaretskii2012-11-01 16:21:45 +0200
commit7e8b50d9e556b1c8b393199995ef3ea85b9f4525 (patch)
tree31db49285d656afca45d08fd4d57234351d953ef /src
parent7a8d34f74e840bed818cc7f537fb1946bf91f062 (diff)
downloademacs-7e8b50d9e556b1c8b393199995ef3ea85b9f4525.tar.gz
emacs-7e8b50d9e556b1c8b393199995ef3ea85b9f4525.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32proc.c12
2 files changed, 16 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4dc18b6909b..e762eb13b87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-11-01 Eli Zaretskii <eliz@gnu.org>
2
3 * w32proc.c (getpgrp, setpgid): New functions. (Bug#12776)
4
12012-10-31 Paul Eggert <eggert@cs.ucla.edu> 52012-10-31 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix crash when using Emacs as commit editor for git (Bug#12697). 7 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)
236 return 0; 236 return 0;
237} 237}
238 238
239pid_t
240getpgrp (void)
241{
242 return getpid ();
243}
244
245int
246setpgid (pid_t pid, pid_t pgid)
247{
248 return 0;
249}
250
239/* Emulations of interval timers. 251/* Emulations of interval timers.
240 252
241 Limitations: only ITIMER_REAL and ITIMER_PROF are supported. 253 Limitations: only ITIMER_REAL and ITIMER_PROF are supported.