From: Andrew Innes <andrewi@gnu.org>
Date: Wed, 23 Aug 2000 21:41:37 +0000 (+0000)
Subject: fix line endings
X-Git-Tag: emacs-pretest-21.0.90~2010
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b329cc1549dc482beb010c72cea0d9e782c19dda;p=emacs.git

fix line endings
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6e554444c4f..097ac44105a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -4168,5 +4168,5 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 	* loadst.c (main) [XENIX]: use /usr/spool/mail, not /usr/mail.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit
+;; coding: iso-2022-7bit-unix
 ;; End:
diff --git a/lib-src/getopt.h b/lib-src/getopt.h
index ac6728f83d4..ba24c14ba44 100644
--- a/lib-src/getopt.h
+++ b/lib-src/getopt.h
@@ -137,14 +137,14 @@ extern int getopt ();
 # endif /* __GNU_LIBRARY__ */
 
 # ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+extern int getopt_long (int argc, char *const *argv, const char *__shortopts,
 		        const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
+extern int getopt_long_only (int argc, char *const *argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int __argc, char *const *__argv,
+extern int _getopt_internal (int argc, char *const *argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind,
 			     int __long_only);
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
new file mode 100644
index 00000000000..3654e82d01f
--- /dev/null
+++ b/lib-src/makefile.w32-in
@@ -0,0 +1,400 @@
+#  Makefile for GNU Emacs lib-src directory.
+#  Copyright (C) 1994, 2000 Free Software Foundation, Inc.
+#
+#  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)
+#  any later version.
+#  
+#  GNU Emacs is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with GNU Emacs; see the file COPYING.  If not, write to the
+#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
+#
+
+ALL	      = make-docfile hexl ctags etags movemail fakemail
+
+.PHONY: $(ALL)
+
+LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
+		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc -I../src
+
+# don't know what (if) to do with these yet...
+#
+#		$(BLD)/sorted-doc.exe	\
+#		$(BLD)/env.exe		\
+#		$(BLD)/server.exe	\
+#		$(BLD)/emacstool.exe	\
+#		$(BLD)/leditcfns.exe	\
+#		$(BLD)/emacsclient.exe	\
+#		$(BLD)/cvtmail.exe	\
+#		$(BLD)/digest-doc.exe	\
+#		$(BLD)/test-distrib.exe	\
+
+
+LIBS	      = $(BASE_LIBS) $(ADVAPI32)
+
+$(BLD)/make-docfile.exe: 	$(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
+$(BLD)/hexl.exe:		$(BLD)/hexl.$(O)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
+$(BLD)/fakemail.exe: 		$(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS)
+
+make-docfile:	$(BLD) $(BLD)/make-docfile.exe
+ctags:		$(BLD) $(BLD)/ctags.exe
+etags:		$(BLD) $(BLD)/etags.exe
+hexl:		$(BLD) $(BLD)/hexl.exe
+movemail:	$(BLD) $(BLD)/movemail.exe
+fakemail:	$(BLD) $(BLD)/fakemail.exe
+
+GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O)
+GETOPTDEPS = $(GETOPTOBJS) getopt.h
+MOVEMAILOBJS =  $(BLD)/movemail.$(O) \
+		$(BLD)/pop.$(O) \
+		$(BLD)/ntlib.$(O) \
+		$(GETOPTOBJS)
+
+$(BLD)/movemail.exe:	$(MOVEMAILOBJS) getopt.h
+# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
+
+ETAGSOBJ      = $(BLD)/etags.$(O) \
+		$(BLD)/getopt.$(O) \
+		$(BLD)/getopt1.$(O) \
+		$(BLD)/ntlib.$(O) \
+		$(BLD)/regex.$(O)
+
+$(BLD)/etags.exe: 	$(ETAGSOBJ)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ETAGSOBJ) $(LIBS)
+
+
+$(BLD)/regex.$(O): ../src/regex.c ../src/regex.h ../src/config.h
+		$(CC)  $(CFLAGS) -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
+		../src/regex.c $(CC_OUT)$@
+
+ETAGS_CFLAGS  = -DHAVE_GETCWD
+$(BLD)/etags.$(O): etags.c
+		$(CC) $(CFLAGS) $(ETAGS_CFLAGS) $(CC_OUT)$@ etags.c
+
+CTAGSOBJ      = $(BLD)/ctags.$(O) \
+		$(BLD)/getopt.$(O) \
+		$(BLD)/getopt1.$(O) \
+		$(BLD)/ntlib.$(O) \
+		$(BLD)/regex.$(O)
+
+$(BLD)/ctags.exe:  $(CTAGSOBJ)
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(CTAGSOBJ) $(LIBS)
+
+ctags.c:	etags.c
+		- $(DEL) ctags.c
+		$(CP) etags.c ctags.c
+
+CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
+$(BLD)/ctags.$(O): ctags.c
+		$(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
+
+#
+# don't know what to do with these yet...
+#
+# $(BLD)/sorted-doc.exe: 	$(BLD)/sorted-doc.$(O)
+# $(BLD)/yow.exe: 		$(BLD)/yow.$(O)
+# $(BLD)/emacstool.exe: 	$(BLD)/emacstool.$(O)
+# $(BLD)/leditcfns.exe: 	$(BLD)/leditcfns.$(O)
+# $(BLD)/server.exe: 		$(BLD)/server.$(O)
+# $(BLD)/cvtmail.exe: 		$(BLD)/cvtmail.$(O)
+# $(BLD)/digest-doc.exe: 	$(BLD)/digest-doc.$(O)
+# $(BLD)/emacsclient.exe: 	$(BLD)/emacsclient.$(O)
+# $(BLD)/test-distrib.exe: 	$(BLD)/test-distrib.$(O)
+
+#
+# From ..\src\makefile.nt.
+#
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c xfaces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
+
+#
+# These are the lisp files that are loaded up in loadup.el
+#
+lispsource = ../lisp/
+
+FACE_SUPPORT = $(lispsource)facemenu.elc
+MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc
+FLOAT_SUPPORT = $(lispsource)float-sup.elc
+WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc
+
+lisp= \
+	$(lispsource)abbrev.elc \
+	$(lispsource)buff-menu.elc \
+	$(lispsource)byte-run.elc \
+	$(lispsource)cus-start.el \
+	$(lispsource)custom.elc \
+	$(lispsource)faces.elc \
+	$(lispsource)files.elc \
+	$(lispsource)textmodes/fill.elc \
+	$(lispsource)format.elc \
+	$(FACE_SUPPORT) \
+	$(MOUSE_SUPPORT) \
+	$(FLOAT_SUPPORT) \
+	$(lispsource)frame.elc\
+	$(X_WINDOWS_SUPPORT) \
+	$(lispsource)help.elc \
+	$(lispsource)indent.elc \
+	$(lispsource)isearch.elc \
+	$(lispsource)emacs-lisp/lisp-mode.elc \
+	$(lispsource)emacs-lisp/lisp.elc \
+	$(lispsource)loadup.el \
+	$(lispsource)loaddefs.el \
+	$(lispsource)map-ynp.elc \
+	$(lispsource)menu-bar.elc \
+	$(lispsource)international/mule.elc \
+	$(lispsource)international/mule-conf.el \
+	$(lispsource)international/mule-cmds.elc \
+	$(lispsource)international/characters.elc \
+	$(lispsource)language/chinese.elc \
+	$(lispsource)language/cyrillic.elc \
+	$(lispsource)language/devanagari.elc \
+	$(lispsource)language/english.elc \
+	$(lispsource)language/ethiopic.elc \
+	$(lispsource)language/european.elc \
+	$(lispsource)language/greek.elc \
+	$(lispsource)language/hebrew.elc \
+	$(lispsource)language/indian.elc \
+	$(lispsource)language/japanese.elc \
+	$(lispsource)language/korean.elc \
+	$(lispsource)language/lao.elc \
+	$(lispsource)language/thai.elc \
+	$(lispsource)language/tibetan.elc \
+	$(lispsource)language/vietnamese.elc \
+	$(lispsource)language/misc-lang.elc \
+	$(lispsource)textmodes/page.elc \
+	$(lispsource)textmodes/paragraphs.elc \
+	$(lispsource)paths.el \
+	$(lispsource)register.elc \
+	$(lispsource)replace.elc \
+	$(lispsource)simple.elc \
+	$(lispsource)startup.elc \
+	$(lispsource)subr.elc \
+	$(lispsource)textmodes/text-mode.elc \
+	$(lispsource)vc-hooks.elc \
+	$(lispsource)ediff-hook.elc \
+	$(VMS_SUPPORT) \
+	$(MSDOS_SUPPORT) \
+	$(WINNT_SUPPORT) \
+	$(lispsource)window.elc \
+	$(lispsource)version.el
+
+
+DOC	      = DOC 
+$(DOC):		$(BLD)/make-docfile.exe
+		- $(DEL) $(DOC)
+		"./$(BLD)/make-docfile" -d ../src $(obj) > $(DOC)
+		"./$(BLD)/make-docfile" -d ../src $(lisp) >> $(DOC)
+		$(CP) $(DOC) ../etc/DOC-X
+		- mkdir "../src/$(OBJDIR)"
+		- mkdir "../src/$(OBJDIR)/etc"
+		$(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X
+
+{$(BLD)}.$(O){$(BLD)}.exe:
+		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS)
+
+#
+# Build the executables
+#
+all:		$(BLD) $(ALL) $(DOC)
+
+#
+# Assuming INSTALL_DIR is defined, build and install emacs in it.
+#
+INSTALL_FILES = $(ALL)
+install:	$(INSTALL_FILES)
+		- mkdir "$(INSTALL_DIR)/bin"
+		$(CP) $(BLD)/etags.exe $(INSTALL_DIR)/bin
+		$(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin
+		$(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin
+		$(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
+		$(CP) $(BLD)/fakemail.exe $(INSTALL_DIR)/bin
+		- mkdir "$(INSTALL_DIR)/etc"
+		$(CP) $(DOC) $(INSTALL_DIR)/etc
+
+#
+# Maintenance
+# 
+clean:
+		- $(DEL) *~ *.pdb DOC*
+		- $(DEL) ctags.c
+		- $(DEL_TREE) $(OBJDIR)
+
+cleanall:	clean
+		- $(DEL_TREE) obj
+		- $(DEL_TREE) obj-spd
+		- $(DEL_TREE) oo
+		- $(DEL_TREE) oo-spd
+
+#
+# Headers we would preprocess if we could.
+#
+../src/config.h:	../nt/$(CONFIG_H)
+			$(CP) $(ALL_DEPS) $@
+../src/paths.h:		../nt/paths.h
+			$(CP) $(ALL_DEPS) $@
+
+### DEPENDENCIES ###
+
+EMACS_ROOT	= ..
+SRC		= .
+
+$(BLD)/alloca.$(O) : \
+	$(SRC)/alloca.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(EMACS_ROOT)/src/blockinput.h
+
+$(BLD)/b2m.$(O) : \
+	$(SRC)/b2m.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h
+
+$(BLD)/ctags.$(O) : \
+	$(SRC)/ctags.c \
+	$(EMACS_ROOT)/nt/inc/sys/param.h \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(SRC)/ntlib.h \
+	$(SRC)/getopt.h
+
+$(BLD)/cvtmail.$(O) : \
+	$(SRC)/cvtmail.c
+
+$(BLD)/digest-doc.$(O) : \
+	$(SRC)/digest-doc.c
+
+$(BLD)/emacsclient.$(O) : \
+	$(SRC)/emacsclient.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h
+
+$(BLD)/emacsserver.$(O) : \
+	$(SRC)/emacsserver.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(EMACS_ROOT)/nt/inc/sys/file.h
+
+$(BLD)/emacstool.$(O) : \
+	$(SRC)/emacstool.c \
+	$(EMACS_ROOT)/nt/inc/sys/file.h
+
+$(BLD)/etags.$(O) : \
+	$(SRC)/etags.c \
+	$(EMACS_ROOT)/nt/inc/sys/param.h \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(SRC)/ntlib.h \
+	$(SRC)/getopt.h
+
+$(BLD)/fakemail.$(O) : \
+	$(SRC)/fakemail.c \
+	$(SRC)/ntlib.h \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(EMACS_ROOT)/nt/inc/pwd.h
+
+$(BLD)/getdate.$(O) : \
+	$(SRC)/getdate.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(MSTOOLS_SYS)/types.h
+
+$(BLD)/getopt.$(O) : \
+	$(SRC)/getopt.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(SRC)/ntlib.h \
+	$(SRC)/getopt.h
+
+$(BLD)/getopt1.$(O) : \
+	$(SRC)/getopt1.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(SRC)/getopt.h
+
+$(BLD)/hexl.$(O) : \
+	$(SRC)/hexl.c
+
+$(BLD)/leditcfns.$(O) : \
+	$(SRC)/leditcfns.c
+
+$(BLD)/make-docfile.$(O) : \
+	$(SRC)/make-docfile.c \
+	$(EMACS_ROOT)/src/config.h
+
+$(BLD)/make-path.$(O) : \
+	$(SRC)/make-path.c
+
+$(BLD)/movemail.$(O) : \
+	$(SRC)/movemail.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(EMACS_ROOT)/nt/inc/sys/file.h \
+	$(EMACS_ROOT)/src/vmsproc.h \
+	$(EMACS_ROOT)/lib-src/../src/syswait.h \
+	$(EMACS_ROOT)/nt/inc/pwd.h \
+	$(SRC)/ntlib.h
+		$(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
+
+$(BLD)/ntlib.$(O) : \
+	$(SRC)/ntlib.c \
+	$(SRC)/ntlib.h \
+	$(EMACS_ROOT)/nt/inc/pwd.h
+
+$(BLD)/pop.$(O) : \
+	$(SRC)/pop.c \
+	$(SRC)/pop.h \
+	$(SRC)/ntlib.h
+
+$(BLD)/profile.$(O) : \
+	$(SRC)/profile.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h \
+	$(EMACS_ROOT)/src/vmstime.h \
+	$(EMACS_ROOT)/lib-src/../src/systime.h
+
+$(BLD)/qsort.$(O) : \
+	$(SRC)/qsort.c
+
+$(BLD)/sorted-doc.$(O) : \
+	$(SRC)/sorted-doc.c
+
+$(BLD)/tcp.$(O) : \
+	$(SRC)/tcp.c
+
+$(BLD)/test-distrib.$(O) : \
+	$(SRC)/test-distrib.c
+
+$(BLD)/timer.$(O) : \
+	$(SRC)/timer.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/lib-src/../src/config.h
+
+$(BLD)/yow.$(O) : \
+	$(SRC)/yow.c \
+	$(EMACS_ROOT)/lib-src/../src/paths.h