Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

[gnu-emacs] / src / s / darwin.h

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 73e196022752c5b48aa3ce1ded838432f6f5161a..dd0d0c34021b9114866542a5d5390b7381b144d5 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,7 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -69,7 +68,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Note: PTYs are broken on darwin <6.  Use at your own risk.  */
 #define HAVE_PTYS
 /* Run only once.  We need a `for'-loop because the code uses `continue'.  */
-#define PTY_ITERATION  for (i = 0; i < 1; i++)
+#define PTY_ITERATION  int i; for (i = 0; i < 1; i++)
 #define PTY_NAME_SPRINTF       /* none */
 #define PTY_TTY_NAME_SPRINTF   /* none */
 /* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8.
@@ -149,6 +148,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
-   (do not change this comment) */