snapshot of project "lynx", label v2-8-3dev_20

6 files changed, 116 insertions, 11 deletions

diff --git a/CHANGES b/CHANGES
index b216db1d..a6a6ad61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2000-02-15 (2.8.3dev.20)
+* ifdef fixes for CYGWIN, broken in dev.19 -TD
+* add make-msc.bat script, and update src/chrtrans/makefile.msc to add rules
+  for generating header files -TD
 2000-02-14 (2.8.3dev.19)
 * use HTAddParam/HTEndParam rather than HTSprintf0 for building external
   commands, protecting against badly-formatted string with more than one %s
diff --git a/src/LYEdit.c b/src/LYEdit.c
index 935cfe0c..e9b9a88d 100644
--- a/src/LYEdit.c
+++ b/src/LYEdit.c
@@ -48,7 +48,7 @@ PUBLIC int edit_current_file ARGS3(
     char *number_sign;
     char position[80];
     FILE *fp;
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) && defined(DOSPATH)
     unsigned char temp_buff[LY_MAXPATH];
 #endif
 
diff --git a/src/LYMail.c b/src/LYMail.c
index 613b0556..3544ba46 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -157,7 +157,7 @@ PUBLIC void mailform ARGS4(
     FILE *hfd;
     char hdrfile[LY_MAXPATH];
 #endif
-#if defined(VMS) || defined(DOSPATH) || defined(SH_EX)
+#if !CAN_PIPE_TO_MAILER
     char *command = NULL;
     char my_tmpfile[LY_MAXPATH];
 #endif
@@ -707,11 +707,9 @@ PUBLIC void mailmsg ARGS4(
 #ifdef ALERTMAIL
     BOOLEAN skip_parsing = FALSE;
 #endif
-#if defined(DOSPATH) || defined(WIN_EX)
+#if !CAN_PIPE_TO_MAILER
     char *ccaddr;
     char subject[128];
-#endif
-#if defined(VMS) || defined(DOSPATH) || defined(WIN_EX)
     char my_tmpfile[LY_MAXPATH];
 #endif
 #ifdef VMS
@@ -1031,10 +1029,8 @@ PUBLIC void reply_by_mail ARGS4(
     int i, len;
     int c = 0;	/* user input */
     char my_tmpfile[LY_MAXPATH], cmd[512];
-#if defined(DOSPATH) || defined(WIN_EX)
+#if !CAN_PIPE_TO_MAILER
     char tmpfile2[LY_MAXPATH];
-#endif
-#if defined(DOSPATH) || defined(WIN_EX) || defined(VMS)
     char *command = NULL;
 #endif
 #ifndef NO_ANONYMOUS_EMAIL
diff --git a/src/LYPrint.c b/src/LYPrint.c
index ca05d3a1..640386cd 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -476,7 +476,7 @@ PRIVATE void send_file_to_mail ARGS3(
     char hdrfile[LY_MAXPATH];
     char my_temp[LY_MAXPATH];
 #endif
-#if defined(DOSPATH)
+#if !CAN_PIPE_TO_MAILER 
     char my_temp[LY_MAXPATH];
 #endif
 
diff --git a/src/chrtrans/makefile.msc b/src/chrtrans/makefile.msc
index 6885a616..409c07c7 100644
--- a/src/chrtrans/makefile.msc
+++ b/src/chrtrans/makefile.msc
@@ -15,9 +15,114 @@ LIBS     = user32.lib wsock32.lib
 COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(DEFS)
 LINK    = $(LD) $(LDFLAGS) /out:$@
 
+
+.SUFFIXES: .tbl
+#
+# This file contains the font map for the default (hardware) font
+#
+
+FONTMAP_INC = iso01_un.h
+
+TABLES= \
+ cp1250_uni.h \
+ cp1251_uni.h \
+ cp1252_uni.h \
+ cp1253_uni.h \
+ cp1255_uni.h \
+ cp1256_uni.h \
+ cp1257_uni.h \
+ cp437_uni.h \
+ cp737_uni.h \
+ cp775_uni.h \
+ cp850_uni.h \
+ cp852_uni.h \
+ cp862_uni.h \
+ cp864_uni.h \
+ cp866_uni.h \
+ cp866u_uni.h \
+ cp869_uni.h \
+ def7_uni.h \
+ dmcs_uni.h \
+ hp_uni.h \
+ iso01_uni.h \
+ iso02_uni.h \
+ iso03_uni.h \
+ iso04_uni.h \
+ iso05_uni.h \
+ iso06_uni.h \
+ iso07_uni.h \
+ iso08_uni.h \
+ iso09_uni.h \
+ iso10_uni.h \
+ iso15_uni.h \
+ koi8r_uni.h \
+ koi8u_uni.h \
+ mac_uni.h \
+ mnem2_suni.h \
+ mnem_suni.h \
+ next_uni.h \
+ rfc_suni.h \
+ utf8_uni.h \
+ viscii_uni.h
+
+default: $(TABLES)
+
+fontmap: $(FONTMAP_INC)
+
 makeuctb.exe : makeuctb.obj
 	$(LINK) makeuctb.obj $(LIBS)
 
 makeuctb.obj :  makeuctb.c
 	$(COMPILE) makeuctb.c
 
+.tbl.h:
+	makeuctb $*.tbl
+
+cp1250_uni.h:		cp1250_uni.tbl		makeuctb.exe
+cp1251_uni.h:		cp1251_uni.tbl		makeuctb.exe
+cp1252_uni.h:		cp1252_uni.tbl		makeuctb.exe
+cp1253_uni.h:		cp1253_uni.tbl		makeuctb.exe
+cp1255_uni.h:		cp1255_uni.tbl		makeuctb.exe
+cp1256_uni.h:		cp1256_uni.tbl		makeuctb.exe
+cp1257_uni.h:		cp1257_uni.tbl		makeuctb.exe
+cp437_uni.h:		cp437_uni.tbl		makeuctb.exe
+cp737_uni.h:		cp737_uni.tbl		makeuctb.exe
+cp775_uni.h:		cp775_uni.tbl		makeuctb.exe
+cp850_uni.h:		cp850_uni.tbl		makeuctb.exe
+cp852_uni.h:		cp852_uni.tbl		makeuctb.exe
+cp862_uni.h:		cp862_uni.tbl		makeuctb.exe
+cp864_uni.h:		cp864_uni.tbl		makeuctb.exe
+cp866_uni.h:		cp866_uni.tbl		makeuctb.exe
+cp866u_uni.h:		cp866u_uni.tbl		makeuctb.exe
+cp869_uni.h:		cp869_uni.tbl		makeuctb.exe
+def7_uni.h:		def7_uni.tbl		makeuctb.exe
+dmcs_uni.h:		dmcs_uni.tbl		makeuctb.exe
+hp_uni.h:               hp_uni.tbl              makeuctb.exe 
+iso01_uni.h:		iso01_uni.tbl		makeuctb.exe
+iso02_uni.h:		iso02_uni.tbl		makeuctb.exe
+iso03_uni.h:		iso03_uni.tbl		makeuctb.exe
+iso04_uni.h:		iso04_uni.tbl		makeuctb.exe
+iso05_uni.h:		iso05_uni.tbl		makeuctb.exe
+iso06_uni.h:		iso06_uni.tbl		makeuctb.exe
+iso07_uni.h:		iso07_uni.tbl		makeuctb.exe
+iso08_uni.h:		iso08_uni.tbl		makeuctb.exe
+iso09_uni.h:		iso09_uni.tbl		makeuctb.exe
+iso10_uni.h:		iso10_uni.tbl		makeuctb.exe
+iso15_uni.h:		iso15_uni.tbl		makeuctb.exe
+koi8r_uni.h:		koi8r_uni.tbl		makeuctb.exe
+koi8u_uni.h:		koi8u_uni.tbl		makeuctb.exe
+mac_uni.h:		mac_uni.tbl		makeuctb.exe
+mnem2_suni.h:		mnem2_suni.tbl		makeuctb.exe
+mnem_suni.h:		mnem_suni.tbl		makeuctb.exe
+next_uni.h:		next_uni.tbl		makeuctb.exe
+rfc_suni.h:		rfc_suni.tbl		makeuctb.exe
+utf8_uni.h:		utf8_uni.tbl		makeuctb.exe
+viscii_uni.h:		viscii_uni.tbl		makeuctb.exe
+
+clean :
+	- erase *.obj
+	- erase *.exe
+	- for %%i in ( $(TABLES) ) do erase %%i
+
+distclean : clean
+	- erase *.bak
diff --git a/userdefs.h b/userdefs.h
index 9e5f3ebd..4f2d4300 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1302,12 +1302,12 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.3dev.19"
+#define LYNX_VERSION "2.8.3dev.20"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/"
 #define LYNX_RELEASE FALSE
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Mon, 14 Feb 2000 20:07:39 -0800"
+#define LYNX_DATE "Tue, 15 Feb 2000 04:01:32 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 #define LYNX_RELEASE_DATE "1999"