Merge from emacs-23

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

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 27ca8813584a197d8e980c7564eff1c8c54b7bb0..774ef3a9ab5cb9b6a23bf8bb181fe9dd2348a9a4 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,5 +1,6 @@
 /* System description header file for Cygwin.
-   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
+
+Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
                  2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -18,8 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "cygwin"
 
 /* Emacs can read input using SIGIO and buffering characters itself,
@@ -43,26 +43,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
    through a pipe. */
-
 #undef INTERRUPT_INPUT
 
-/*
- *     Define HAVE_TERMIOS if the system provides POSIX-style
- *     functions and macros for terminal control.
- *
- *     Define HAVE_TERMIO if the system provides sysV-style ioctls
- *     for terminal control.
- *
- *     Do not define both.  HAVE_TERMIOS is preferred, if it is
- *     supported on your system.
- */
-
-#define HAVE_TERMIOS
-
-/*
- *     Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define PTY_ITERATION          for (i = 0; i < 1; i++) /* ick */
 #define PTY_NAME_SPRINTF       /* none */
@@ -80,14 +63,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     }                                                  \
   while (0)
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-#define BSTRING
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
@@ -95,21 +73,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    generated in the Makefile generated by `xmkmf'.  If we don't
    define NARROWPROTO, we will see the wrong function prototypes
    for X functions taking float or double parameters.  */
-
 #define NARROWPROTO 1
 
-/* used in various places to enable cygwin-specific code changes */
+/* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-#define SYSV_SYSTEM_DIR 1
-#define UNEXEC unexcw.o
-#define POSIX_SIGNALS 1
-#define LINKER $(CC)
-
-/* Use terminfo instead of termcap.  Fewer environment variables to
-   go wrong, more terminal types. */
-#define TERMINFO
 
 #define HAVE_SOCKETS
 
@@ -135,7 +104,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Send signals to subprocesses by "typing" special chars at them.  */
 #define SIGNALS_VIA_CHARACTERS
 
-/* the end */
-
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
    (do not change this comment) */