aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorDan Nicolaescu2010-05-04 00:40:53 -0700
committerDan Nicolaescu2010-05-04 00:40:53 -0700
commit58eb6cf0f77547d29f4fddca922eb6f98c0ffb28 (patch)
treedc7bd97ce77e679cfb648145413039dff6ff4c92 /src/emacs.c
parentef03a4e61efa0003b1b6be961b58297ccfddc664 (diff)
downloademacs-58eb6cf0f77547d29f4fddca922eb6f98c0ffb28.tar.gz
emacs-58eb6cf0f77547d29f4fddca922eb6f98c0ffb28.zip
Remove BSD_PGRPS.
* s/bsd-common.h (BSD_PGRPS): Remove undef. * s/gnu-linux.h (BSD_PGRPS): Remove. * term.c (dissociate_if_controlling_tty): * sysdep.c (narrow_foreground_group, widen_foreground_group) (init_sys_modes, reset_sys_modes): * emacs.c (main): * callproc.c (Fcall_process, child_setup): Remove code depending on BSD_PGRPS.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/emacs.c b/src/emacs.c
index d40ff3662f0..06c686d9950 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -81,7 +81,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
81#endif 81#endif
82 82
83#ifdef HAVE_SETPGID 83#ifdef HAVE_SETPGID
84#if !defined (USG) || defined (BSD_PGRPS) 84#if !defined (USG)
85#undef setpgrp 85#undef setpgrp
86#define setpgrp setpgid 86#define setpgrp setpgid
87#endif 87#endif
@@ -193,11 +193,6 @@ EMACS_INT emacs_priority;
193 data on the first attempt to change it inside asynchronous code. */ 193 data on the first attempt to change it inside asynchronous code. */
194int running_asynch_code; 194int running_asynch_code;
195 195
196#ifdef BSD_PGRPS
197/* See sysdep.c. */
198extern int inherited_pgroup;
199#endif
200
201#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) 196#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
202/* If non-zero, -d was specified, meaning we're using some window system. */ 197/* If non-zero, -d was specified, meaning we're using some window system. */
203int display_arg; 198int display_arg;
@@ -1187,17 +1182,9 @@ main (int argc, char **argv)
1187 1182
1188 if (! noninteractive) 1183 if (! noninteractive)
1189 { 1184 {
1190#ifdef BSD_PGRPS
1191 if (initialized)
1192 {
1193 inherited_pgroup = EMACS_GETPGRP (0);
1194 setpgrp (0, getpid ());
1195 }
1196#else
1197#if defined (USG5) && defined (INTERRUPT_INPUT) 1185#if defined (USG5) && defined (INTERRUPT_INPUT)
1198 setpgrp (); 1186 setpgrp ();
1199#endif 1187#endif
1200#endif
1201#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC) 1188#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
1202 { 1189 {
1203 extern void malloc_enable_thread P_ ((void)); 1190 extern void malloc_enable_thread P_ ((void));