src/w32fns.c (Fw32_shell_execute): Declare `result' only on Cygwin.

[bpt/emacs.git] / msdos / sed3v2.inp

diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 3b20651..dcc09dd 100644 (file)
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -2,7 +2,7 @@
 # Configuration script for lib-src/makefile under DJGPP v2
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1998, 2000-2011  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000-2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -35,10 +35,13 @@ s/-DVERSION[^ ]* //
 /^LIBRESOLV *=/s/@[^@\n]*@//g
 /^LIBS_MAIL *=/s/@[^@\n]*@//g
 /^LIBS_SYSTEM *=/s/@[^@\n]*@//g
+/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
+/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
-/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
+/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos!
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
-/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
+/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
@@ -50,5 +53,4 @@ s!^   \./!    !
   s/movemail[^ ]* *//
 }
 /^insrcdir=/s/^.*$/\#&/
-/^      *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<,
-
+/^      *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $(<F),