2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e352ada73a3..dd46874e679 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge gnulib getopt implementation into Emacs.
+
+        * s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
+        now part of lib-src.
+
 2005-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (Fdefvar): Allow (defvar enable-multibyte-characters).
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 0094ef793dc..ac977b8cb52 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,7 +1,7 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -123,8 +123,6 @@ Boston, MA 02110-1301, USA.  */
    emacs lisp pointers */
 #define DATA_SEG_BITS 0x20000000
 #define LINKER $(CC) -Wl,--image-base,DATA_SEG_BITS
-/* gettext.h is in a strange place */
-#define C_SWITCH_SYSTEM -I/usr/share/gettext
 
 /* Use terminfo instead of termcap.  Fewer environment variables to
    go wrong, more terminal types. */