(XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return.

[bpt/emacs.git] / src / sysdep.c

diff --git a/src/sysdep.c b/src/sysdep.c
index 3e06170..6699d23 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1,12 +1,13 @@
 /* Interfaces to system-dependent kernel and library entries.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
 /* Interfaces to system-dependent kernel and library entries.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,

-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -244,7 +245,7 @@ int emacs_ospeed;
    under VMS, we place the input channel number here.  */
 int input_fd;
 
    under VMS, we place the input channel number here.  */
 int input_fd;
 

-void croak P_ ((char *));
+void croak P_ ((char *)) NO_RETURN;

 
 #ifdef AIXHFT
 void hft_init ();
 
 #ifdef AIXHFT
 void hft_init ();


@@ -1373,16 +1374,6 @@ init_sys_modes ()
 {
   struct emacs_tty tty;
 
 {
   struct emacs_tty tty;
 

-#ifdef MAC_OS8
-/* cus-start.el complains if delete-exited-processes is not defined */
-#ifndef subprocesses
-  DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,
-              doc: /* *Non-nil means delete processes immediately when they exit.
-nil means don't delete them until `list-processes' is run.  */);
-  delete_exited_processes = 0;
-#endif
-#endif /* MAC_OS8 */
-

 #ifdef VMS
 #if 0
   static int oob_chars[2] = {0, 1 << 7}; /* catch C-g's */
 #ifdef VMS
 #if 0
   static int oob_chars[2] = {0, 1 << 7}; /* catch C-g's */


@@ -2443,7 +2434,9 @@ init_system_name ()
                /* We still don't have a fully qualified domain name.
                   Try to find one in the list of alternate names */
                char **alias = hp->h_aliases;
                /* We still don't have a fully qualified domain name.
                   Try to find one in the list of alternate names */
                char **alias = hp->h_aliases;

-               while (*alias && !index (*alias, '.'))
+               while (*alias
+                      && (!index (*alias, '.')
+                          || !strcmp (*alias, "localhost.localdomain")))

                  alias++;
                if (*alias)
                  fqdn = *alias;
                  alias++;
                if (*alias)
                  fqdn = *alias;


@@ -3328,6 +3321,15 @@ emacs_close (fd)
   int did_retry = 0;
   register int rtnval;
 
   int did_retry = 0;
   register int rtnval;
 

+#if defined (MAC_OSX) && defined (HAVE_CARBON)
+  {
+    extern int mac_try_close_socket P_ ((int));
+
+    if (mac_try_close_socket (fd))
+      return 0;
+  }
+#endif
+

   while ((rtnval = close (fd)) == -1
         && (errno == EINTR))
     did_retry = 1;
   while ((rtnval = close (fd)) == -1
         && (errno == EINTR))
     did_retry = 1;


@@ -3766,7 +3768,7 @@ set_file_times (filename, atime, mtime)
  *                                     sdcsvax!rmr or rmr@uscd
  *
  * Severely hacked over by John Gilmore to make a 4.2BSD compatible
  *                                     sdcsvax!rmr or rmr@uscd
  *
  * Severely hacked over by John Gilmore to make a 4.2BSD compatible

- * subroutine. 11Mar86; hoptoad!gnu
+ * subroutine.  11Mar86; hoptoad!gnu

  *
  * Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir,
  * subroutine didn't return EEXIST.  It does now.
  *
  * Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir,
  * subroutine didn't return EEXIST.  It does now.