Merge from emacs--devo--0

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

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 72ed8964a7d95969d88a620528ff6f03ea0ab34a..a2a3d862f806dfe9c4fe83ee786f6967e7670122 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -6,7 +6,7 @@ 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,
@@ -50,12 +50,10 @@ Boston, MA 02110-1301, USA.  */
 #ifdef MAC_OSX
 #ifdef HAVE_CARBON
 #define MAC_OS
-#endif
-#endif
-
 /* We need a little extra space, see ../../lisp/loadup.el. */
 #define SYSTEM_PURESIZE_EXTRA 30000
-
+#endif
+#endif
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */