snapshot of project "lynx", label v2-8-8dev_12b

7 files changed, 310 insertions, 283 deletions

diff --git a/INSTALLATION b/INSTALLATION
index 3dcc566d..cb523ef7 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -912,6 +912,30 @@ IV. Compile instructions -- Win32 (Windows95/98/NT)
 
 Borland C:
 
+--  --------------------------------------------------------------------------
+    Download these "setup" files from http://gnuwin32.sourceforge.net
+	libiconv-1.9.2-1.exe (libiconv)
+	libintl-0.14.4.exe (libintl)
+	openssl-0.9.8h-1-setup.exe (openssl)
+	pdcurses-2.6.exe (pdcurses)
+	zlib-1.2.3.exe (zlib)
+    Install all of the packages in the same directory, e.g., "c:\app\GnuWin32".
+
+    Fix is needed in GnuWin32 include/zconf.h, change line reading
+    	#if 1	/* HAVE_UNISTD_H -- this line is updated by ./configure */
+    to
+    	#ifdef HAVE_UNISTD_H
+
+    Prepare import-libraries using Borland's implib program.  The ".lib"
+    files that it uses are a different format than the Microsoft import
+    libraries.
+    	for {name} in *.dll
+	do
+		implib -a {name}.lib {name}.dll
+	done
+
+--  --------------------------------------------------------------------------
+
     The original Win32 port was built with Borland C++ 4.52, but later
     versions reportedly can be used.  Before compiling the Lynx sources, you
     need a curses library, and it is recommended that you have the zlib
@@ -1387,4 +1411,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.117 2012/02/03 22:29:17 tom Exp $
+-- $LynxId: INSTALLATION,v 1.118 2012/07/05 00:40:44 tom Exp $
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 5df9c620..606cd1b7 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.109 2012/02/10 18:44:24 tom Exp $
+ * $LynxId: HTUtils.h,v 1.110 2012/07/04 19:37:26 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -224,7 +224,7 @@ extern void sleep(unsigned __seconds);
 #define popen _popen
 #define pclose _pclose
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER > 0)
 typedef unsigned short mode_t;
 #endif
 
diff --git a/lynx.rsp b/lynx.rsp
index b7f4f247..ec2c3822 100644
--- a/lynx.rsp
+++ b/lynx.rsp
@@ -1,89 +1,87 @@
-../obj/DefaultStyle.obj
-../obj/GridText.obj
-../obj/HTAabrow.obj
-../obj/HTAaprot.obj
-../obj/HTAautil.obj
-../obj/HTAccess.obj
-../obj/HTAlert.obj
-../obj/HTAnchor.obj
-../obj/HTAssoc.obj
-../obj/HTAtom.obj
-../obj/HTBtree.obj
-../obj/HTChunk.obj
-../obj/HTDOS.obj
-../obj/HTFile.obj
-../obj/HTFinger.obj
-../obj/HTFormat.obj
-../obj/HTFtp.obj
-../obj/HTFwriter.obj
-../obj/HTGopher.obj
-../obj/HTGroup.obj
-../obj/HTInit.obj
-../obj/HTLex.obj
-../obj/HTList.obj
-../obj/HTMIME.obj
-../obj/HTML.obj
-../obj/HTMLDTD.obj
-../obj/HTMLGen.obj
-../obj/HTNews.obj
-../obj/HTParse.obj
-../obj/HTPlain.obj
-../obj/HTRules.obj
-../obj/HTString.obj
-../obj/HTStyle.obj
-../obj/HTTP.obj
-../obj/HTTcp.obj
-../obj/HTTelnet.obj
-../obj/HTUU.obj
-../obj/HTWSRC.obj
-../obj/LYBookmark.obj
-../obj/LYCgi.obj
-../obj/LYCharSets.obj
-../obj/LYCharUtils.obj
-../obj/LYClean.obj
-../obj/LYCookie.obj
-../obj/LYCurses.obj
-../obj/LYDownload.obj
-../obj/LYEdit.obj
-../obj/LYEditmap.obj
-../obj/LYExit.obj
-../obj/LYExtern.obj
-../obj/LYForms.obj
-../obj/LYGetFile.obj
-../obj/LYHistory.obj
-../obj/LYJump.obj
-../obj/LYKeymap.obj
-../obj/LYLeaks.obj
-../obj/LYList.obj
-../obj/LYLocal.obj
-../obj/LYMail.obj
-../obj/LYMain.obj
-../obj/LYMainLoop.obj
-../obj/LYMap.obj
-../obj/LYNews.obj
-../obj/LYOptions.obj
-../obj/LYPrint.obj
-../obj/LYPrettySrc.obj
-../obj/LYReadCFG.obj
-../obj/LYSearch.obj
-../obj/LYSession.obj
-../obj/LYShowInfo.obj
-../obj/LYStrings.obj
-../obj/LYTraversal.obj
-../obj/LYUpload.obj
-../obj/LYmktime.obj
-../obj/LYrcFile.obj
-../obj/parsdate.obj
-../obj/SGML.obj
-../obj/TRSTable.obj
-../obj/UCAuto.obj
-../obj/UCAux.obj
-../obj/UCdomap.obj
-../obj/lyutils.obj
-../obj/xsystem.obj
-../curses/PDCURSES.LIB
-../curses/zdllbor.lib
-../curses/libeay32.lib
-../curses/ssleay32.lib
-../curses/iconv.lib
-../curses/libintl.lib
+DefaultStyle.obj
+GridText.obj
+HTAabrow.obj
+HTAaprot.obj
+HTAautil.obj
+HTAccess.obj
+HTAlert.obj
+HTAnchor.obj
+HTAssoc.obj
+HTAtom.obj
+HTBtree.obj
+HTChunk.obj
+HTDOS.obj
+HTFile.obj
+HTFinger.obj
+HTFormat.obj
+HTFtp.obj
+HTFwriter.obj
+HTGopher.obj
+HTGroup.obj
+HTInit.obj
+HTLex.obj
+HTList.obj
+HTMIME.obj
+HTML.obj
+HTMLDTD.obj
+HTMLGen.obj
+HTNews.obj
+HTParse.obj
+HTPlain.obj
+HTRules.obj
+HTString.obj
+HTStyle.obj
+HTTP.obj
+HTTcp.obj
+HTTelnet.obj
+HTUU.obj
+HTWSRC.obj
+LYBookmark.obj
+LYCgi.obj
+LYCharSets.obj
+LYCharUtils.obj
+LYClean.obj
+LYCookie.obj
+LYCurses.obj
+LYDownload.obj
+LYEdit.obj
+LYEditmap.obj
+LYExit.obj
+LYExtern.obj
+LYForms.obj
+LYGetFile.obj
+LYHistory.obj
+LYJump.obj
+LYKeymap.obj
+LYLeaks.obj
+LYList.obj
+LYLocal.obj
+LYMail.obj
+LYMain.obj
+LYMainLoop.obj
+LYMap.obj
+LYNews.obj
+LYOptions.obj
+LYPrint.obj
+LYPrettySrc.obj
+LYReadCFG.obj
+LYSearch.obj
+LYSession.obj
+LYShowInfo.obj
+LYStrings.obj
+LYTraversal.obj
+LYUpload.obj
+LYmktime.obj
+LYrcFile.obj
+parsdate.obj
+SGML.obj
+TRSTable.obj
+UCAuto.obj
+UCAux.obj
+UCdomap.obj
+lyutils.obj
+xsystem.obj
+zlib1.lib
+curses2.lib
+libintl3.lib
+libiconv2.lib
diff --git a/makefile.bcb b/makefile.bcb
index c1d093c1..7c1b972d 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -1,4 +1,4 @@
-# $LynxId: makefile.bcb,v 1.16 2011/06/04 14:18:03 tom Exp $
+# $LynxId: makefile.bcb,v 1.17 2012/07/05 00:57:52 tom Exp $
 #
 # Borland C++ / C++ builder
 # 1997/11/08 (Sat) 10:45:37
@@ -19,10 +19,10 @@ TASM32  = Tasm32
 #
 BCB = $(MAKEDIR)/..
 BCC_INC = $(BCB)/INCLUDE
-#BCC_INC = c:/cbuilder/include
 WWW_LIB = WWW/Library/Implementation
-OBJ = ..\obj
-ETC_LIB = ../curses
+
+ETC_INC = c:\app\GnuWin32\include
+ETC_LIB = c:\app\GnuWin32\bin-bcc
 
 
 #
@@ -36,13 +36,13 @@ DEBUG=
 # Uncomment the CS_DEFS and CS_OBJS lines if you wish to build the color-style
 # configuration.
 #CS_DEFS = /DCHAR_BIT=8 /DUSE_COLOR_STYLE
-#CS_OBJS = $(OBJ)/LYHash.obj $(OBJ)/LYStyle.obj
+#CS_OBJS = LYHash.obj LYStyle.obj
 
 # Uncomment SOCK_DEFS if you wish to build with winsock2.
 #SOCK_DEFS = /DUSE_WINSOCK2_H /D_WIN32_WINNT=0x0400
 
 CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
--I./;$(ETC_LIB);$(ETC_LIB)/openssl;SRC;$(WWW_LIB);$(BCC_INC);SRC/CHRTRANS \
+-I./;$(ETC_INC);$(ETC_INC)/openssl;SRC;$(WWW_LIB);$(BCC_INC);SRC/CHRTRANS \
 -DACCESS_AUTH \
 -DCJK_EX \
 -DCOLOR_CURSES \
@@ -71,7 +71,6 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
 -DUSE_EXTERNALS \
 -DUSE_JUSTIFY_ELTS \
 -DUSE_MULTIBYTE_CURSES \
--DFEPCTRL \
 -DENABLE_NLS \
 -DHAVE_GETTEXT \
 -DHAVE_LIBINTL_H \
@@ -82,9 +81,11 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
 -DUSE_ZLIB \
 -DVC="2.14FM" \
 -DWIN_EX \
+-D_MSC_VER=0 \
 -D_WINDOWS \
 -D_WIN_CC=1 \
--DUSE_SSL \
+-DUSE_PROGRAM_DIR \
+-DICONV_CONST=const \
 -DUSE_X509_SUPPORT \
 -DEXP_JAPANESEUTF8_SUPPORT
 
@@ -99,530 +100,529 @@ lynx : BccW32.cfg $(Dep_lynx)
 clean :
 	-del *.tds
 	-del *.map
-	-del $(OBJ)\*.obj
+	-del *.obj
 	-del BccW32.cfg 
 	-del /f/s/q *.i
 
 Dep_lynxdexe = \
-   $(ETC_LIB)/zdllbor.lib\
-   $(ETC_LIB)/pdcurses.lib\
+   $(ETC_LIB)/zlib1.lib\
+   $(ETC_LIB)/curses2.lib\
    $(ETC_LIB)/libeay32.lib\
-   $(ETC_LIB)/ssleay32.lib\
-   $(ETC_LIB)/iconv.lib\
-   $(ETC_LIB)/libintl.lib\
-   $(ETC_LIB)/iconv.lib\
-   $(OBJ)/DefaultStyle.obj\
-   $(OBJ)/GridText.obj\
-   $(OBJ)/HTAABrow.obj\
-   $(OBJ)/HTAAProt.obj\
-   $(OBJ)/HTAAUtil.obj\
-   $(OBJ)/HTAccess.obj\
-   $(OBJ)/HTAlert.obj\
-   $(OBJ)/HTAnchor.obj\
-   $(OBJ)/HTAssoc.obj\
-   $(OBJ)/HTAtom.obj\
-   $(OBJ)/HTBtree.obj\
-   $(OBJ)/HTChunk.obj\
-   $(OBJ)/HTDOS.obj\
-   $(OBJ)/HTFile.obj\
-   $(OBJ)/HTFinger.obj\
-   $(OBJ)/HTFormat.obj\
-   $(OBJ)/HTFtp.obj\
-   $(OBJ)/HTFwriter.obj\
-   $(OBJ)/HTGopher.obj\
-   $(OBJ)/HTGroup.obj\
-   $(OBJ)/HTInit.obj\
-   $(OBJ)/HTLex.obj\
-   $(OBJ)/HTList.obj\
-   $(OBJ)/HTMIME.obj\
-   $(OBJ)/HTML.obj\
-   $(OBJ)/HTMLDTD.obj\
-   $(OBJ)/HTMLGen.obj\
-   $(OBJ)/HTNews.obj\
-   $(OBJ)/HTParse.obj\
-   $(OBJ)/HTPlain.obj\
-   $(OBJ)/HTRules.obj\
-   $(OBJ)/HTString.obj\
-   $(OBJ)/HTStyle.obj\
-   $(OBJ)/HTTP.obj\
-   $(OBJ)/HTTcp.obj\
-   $(OBJ)/HTTelnet.obj\
-   $(OBJ)/HTUU.obj\
-   $(OBJ)/HTWSRC.obj\
-   $(OBJ)/LYBookmark.obj\
-   $(OBJ)/LYCgi.obj\
-   $(OBJ)/LYCharSets.obj\
-   $(OBJ)/LYCharUtils.obj\
-   $(OBJ)/LYClean.obj\
-   $(OBJ)/LYCookie.obj\
-   $(OBJ)/LYCurses.obj\
-   $(OBJ)/LYDownload.obj\
-   $(OBJ)/LYEdit.obj\
-   $(OBJ)/LYEditmap.obj\
-   $(OBJ)/LYExit.obj\
-   $(OBJ)/LYExtern.obj\
-   $(OBJ)/LYForms.obj\
-   $(OBJ)/LYGetFile.obj\
-   $(OBJ)/LYHistory.obj\
-   $(OBJ)/LYJump.obj\
-   $(OBJ)/LYKeymap.obj\
-   $(OBJ)/LYLeaks.obj\
-   $(OBJ)/LYList.obj\
-   $(OBJ)/LYLocal.obj\
-   $(OBJ)/LYMail.obj\
-   $(OBJ)/LYMain.obj\
-   $(OBJ)/LYMainLoop.obj\
-   $(OBJ)/LYMap.obj\
-   $(OBJ)/LYNews.obj\
-   $(OBJ)/LYOptions.obj\
-   $(OBJ)/LYPrettySrc.obj\
-   $(OBJ)/LYPrint.obj\
-   $(OBJ)/LYReadCFG.obj\
-   $(OBJ)/LYSearch.obj\
-   $(OBJ)/LYSession.obj\
-   $(OBJ)/LYShowInfo.obj\
-   $(OBJ)/LYStrings.obj\
-   $(OBJ)/LYTraversal.obj\
-   $(OBJ)/LYUpload.obj\
-   $(OBJ)/LYUtils.obj\
-   $(OBJ)/LYmktime.obj\
-   $(OBJ)/LYrcFile.obj\
-   $(OBJ)/parsdate.obj\
-   $(OBJ)/SGML.obj\
-   $(OBJ)/TRSTable.obj\
-   $(OBJ)/UCAuto.obj\
-   $(OBJ)/UCAux.obj\
-   $(OBJ)/UCdomap.obj\
-   $(OBJ)/Xsystem.obj $(CS_OBJS)
+   $(ETC_LIB)/libssl32.lib\
+   $(ETC_LIB)/libiconv2.lib\
+   $(ETC_LIB)/libintl3.lib\
+   DefaultStyle.obj\
+   GridText.obj\
+   HTAABrow.obj\
+   HTAAProt.obj\
+   HTAAUtil.obj\
+   HTAccess.obj\
+   HTAlert.obj\
+   HTAnchor.obj\
+   HTAssoc.obj\
+   HTAtom.obj\
+   HTBtree.obj\
+   HTChunk.obj\
+   HTDOS.obj\
+   HTFile.obj\
+   HTFinger.obj\
+   HTFormat.obj\
+   HTFtp.obj\
+   HTFwriter.obj\
+   HTGopher.obj\
+   HTGroup.obj\
+   HTInit.obj\
+   HTLex.obj\
+   HTList.obj\
+   HTMIME.obj\
+   HTML.obj\
+   HTMLDTD.obj\
+   HTMLGen.obj\
+   HTNews.obj\
+   HTParse.obj\
+   HTPlain.obj\
+   HTRules.obj\
+   HTString.obj\
+   HTStyle.obj\
+   HTTP.obj\
+   HTTcp.obj\
+   HTTelnet.obj\
+   HTUU.obj\
+   HTWSRC.obj\
+   LYBookmark.obj\
+   LYCgi.obj\
+   LYCharSets.obj\
+   LYCharUtils.obj\
+   LYClean.obj\
+   LYCookie.obj\
+   LYCurses.obj\
+   LYDownload.obj\
+   LYEdit.obj\
+   LYEditmap.obj\
+   LYExit.obj\
+   LYExtern.obj\
+   LYForms.obj\
+   LYGetFile.obj\
+   LYHistory.obj\
+   LYJump.obj\
+   LYKeymap.obj\
+   LYLeaks.obj\
+   LYList.obj\
+   LYLocal.obj\
+   LYMail.obj\
+   LYMain.obj\
+   LYMainLoop.obj\
+   LYMap.obj\
+   LYNews.obj\
+   LYOptions.obj\
+   LYPrettySrc.obj\
+   LYPrint.obj\
+   LYReadCFG.obj\
+   LYSearch.obj\
+   LYSession.obj\
+   LYShowInfo.obj\
+   LYStrings.obj\
+   LYTraversal.obj\
+   LYUpload.obj\
+   LYUtils.obj\
+   LYmktime.obj\
+   LYrcFile.obj\
+   parsdate.obj\
+   SGML.obj\
+   TRSTable.obj\
+   UCAuto.obj\
+   UCAux.obj\
+   UCdomap.obj\
+   Xsystem.obj $(CS_OBJS)
 
 
 lynx.exe : $(Dep_lynxdexe)
 #	$(BCC32) $(DEBUG) -lOS -elynx.exe @lynx_dbg.rsp
-	$(BCC32) $(DEBUG) -lOS -elynx.exe $(CS_OBJS) @lynx.rsp
+	$(BCC32) $(DEBUG) -lOS -elynx.exe $(CS_OBJS) -L$(ETC_LIB) @lynx.rsp
 #
 ###
 
-$(OBJ)/HTDOS.obj :  $(WWW_LIB)/HTDOS.c
+HTDOS.obj :  $(WWW_LIB)/HTDOS.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTDOS.c
 |
 
-$(OBJ)/UCAuto.obj :  src/UCAuto.c
+UCAuto.obj :  src/UCAuto.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/UCAuto.c
 |
 
-$(OBJ)/UCAux.obj :  src/UCAux.c
+UCAux.obj :  src/UCAux.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/UCAux.c
 |
 
-$(OBJ)/UCdomap.obj :  src/UCdomap.c
+UCdomap.obj :  src/UCdomap.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/UCdomap.c
 |
 
-$(OBJ)/HTAlert.obj :  src/HTAlert.c
+HTAlert.obj :  src/HTAlert.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/HTAlert.c
 |
 
-$(OBJ)/HTFwriter.obj :  src/HTFwriter.c
+HTFwriter.obj :  src/HTFwriter.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/HTFwriter.c
 |
 
-$(OBJ)/HTInit.obj :  src/HTInit.c
+HTInit.obj :  src/HTInit.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/HTInit.c
 |
 
-$(OBJ)/HTTcp.obj :  $(WWW_LIB)/HTTcp.c
+HTTcp.obj :  $(WWW_LIB)/HTTcp.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTTcp.c
 |
 
-$(OBJ)/HTAABrow.obj :  $(WWW_LIB)/HTAABrow.c
+HTAABrow.obj :  $(WWW_LIB)/HTAABrow.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAABrow.c
 |
 
-$(OBJ)/HTAAProt.obj :  $(WWW_LIB)/HTAAProt.c
+HTAAProt.obj :  $(WWW_LIB)/HTAAProt.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAAProt.c
 |
 
-$(OBJ)/HTAAUtil.obj :  $(WWW_LIB)/HTAAUtil.c
+HTAAUtil.obj :  $(WWW_LIB)/HTAAUtil.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAAUtil.c
 |
 
-$(OBJ)/HTAccess.obj :  $(WWW_LIB)/HTAccess.c
+HTAccess.obj :  $(WWW_LIB)/HTAccess.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAccess.c
 |
 
-$(OBJ)/HTAnchor.obj :  $(WWW_LIB)/HTAnchor.c
+HTAnchor.obj :  $(WWW_LIB)/HTAnchor.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAnchor.c
 |
 
-$(OBJ)/HTAssoc.obj :  $(WWW_LIB)/HTAssoc.c
+HTAssoc.obj :  $(WWW_LIB)/HTAssoc.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAssoc.c
 |
 
-$(OBJ)/HTAtom.obj :  $(WWW_LIB)/HTAtom.c
+HTAtom.obj :  $(WWW_LIB)/HTAtom.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTAtom.c
 |
 
-$(OBJ)/HTBtree.obj :  $(WWW_LIB)/HTBtree.c
+HTBtree.obj :  $(WWW_LIB)/HTBtree.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTBtree.c
 |
 
-$(OBJ)/HTChunk.obj :  $(WWW_LIB)/HTChunk.c
+HTChunk.obj :  $(WWW_LIB)/HTChunk.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTChunk.c
 |
 
-$(OBJ)/HTFile.obj :  $(WWW_LIB)/HTFile.c
+HTFile.obj :  $(WWW_LIB)/HTFile.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTFile.c
 |
 
-$(OBJ)/HTFinger.obj :  $(WWW_LIB)/HTFinger.c
+HTFinger.obj :  $(WWW_LIB)/HTFinger.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTFinger.c
 |
 
-$(OBJ)/HTFormat.obj :  $(WWW_LIB)/HTFormat.c
+HTFormat.obj :  $(WWW_LIB)/HTFormat.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTFormat.c
 |
 
-$(OBJ)/HTFtp.obj :  $(WWW_LIB)/HTFtp.c
+HTFtp.obj :  $(WWW_LIB)/HTFtp.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTFtp.c
 |
 
-$(OBJ)/HTGopher.obj :  $(WWW_LIB)/HTGopher.c
+HTGopher.obj :  $(WWW_LIB)/HTGopher.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTGopher.c
 |
 
-$(OBJ)/HTGroup.obj :  $(WWW_LIB)/HTGroup.c
+HTGroup.obj :  $(WWW_LIB)/HTGroup.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTGroup.c
 |
 
-$(OBJ)/HTLex.obj :  $(WWW_LIB)/HTLex.c
+HTLex.obj :  $(WWW_LIB)/HTLex.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTLex.c
 |
 
-$(OBJ)/HTList.obj :  $(WWW_LIB)/HTList.c
+HTList.obj :  $(WWW_LIB)/HTList.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTList.c
 |
 
-$(OBJ)/HTMIME.obj :  $(WWW_LIB)/HTMIME.c
+HTMIME.obj :  $(WWW_LIB)/HTMIME.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTMIME.c
 |
 
-$(OBJ)/HTMLDTD.obj :  $(WWW_LIB)/HTMLDTD.c
+HTMLDTD.obj :  $(WWW_LIB)/HTMLDTD.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTMLDTD.c
 |
 
-$(OBJ)/HTMLGen.obj :  $(WWW_LIB)/HTMLGen.c
+HTMLGen.obj :  $(WWW_LIB)/HTMLGen.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTMLGen.c
 |
 
-$(OBJ)/HTNews.obj :  $(WWW_LIB)/HTNews.c
+HTNews.obj :  $(WWW_LIB)/HTNews.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTNews.c
 |
 
-$(OBJ)/HTParse.obj :  $(WWW_LIB)/HTParse.c
+HTParse.obj :  $(WWW_LIB)/HTParse.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTParse.c
 |
 
-$(OBJ)/HTPlain.obj :  $(WWW_LIB)/HTPlain.c
+HTPlain.obj :  $(WWW_LIB)/HTPlain.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTPlain.c
 |
 
-$(OBJ)/HTRules.obj :  $(WWW_LIB)/HTRules.c
+HTRules.obj :  $(WWW_LIB)/HTRules.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTRules.c
 |
 
-$(OBJ)/HTString.obj :  $(WWW_LIB)/HTString.c
+HTString.obj :  $(WWW_LIB)/HTString.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTString.c
 |
 
-$(OBJ)/HTStyle.obj :  $(WWW_LIB)/HTStyle.c
+HTStyle.obj :  $(WWW_LIB)/HTStyle.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTStyle.c
 |
 
-$(OBJ)/HTTelnet.obj :  $(WWW_LIB)/HTTelnet.c
+HTTelnet.obj :  $(WWW_LIB)/HTTelnet.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTTelnet.c
 |
 
-$(OBJ)/HTTP.obj :  $(WWW_LIB)/HTTP.c
+HTTP.obj :  $(WWW_LIB)/HTTP.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTTP.c
 |
 
-$(OBJ)/HTUU.obj :  $(WWW_LIB)/HTUU.c
+HTUU.obj :  $(WWW_LIB)/HTUU.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTUU.c
 |
 
-$(OBJ)/HTWSRC.obj :  $(WWW_LIB)/HTWSRC.c
+HTWSRC.obj :  $(WWW_LIB)/HTWSRC.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/HTWSRC.c
 |
 
-$(OBJ)/SGML.obj :  $(WWW_LIB)/SGML.c
+SGML.obj :  $(WWW_LIB)/SGML.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ $(WWW_LIB)/SGML.c
 |
 
-$(OBJ)/DefaultStyle.obj :  src/DefaultStyle.c
+DefaultStyle.obj :  src/DefaultStyle.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/DefaultStyle.c
 |
 
-$(OBJ)/GridText.obj :  src/GridText.c
+GridText.obj :  src/GridText.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/GridText.c
 |
 
-$(OBJ)/HTML.obj :  src/HTML.c
+HTML.obj :  src/HTML.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/HTML.c
 |
 
-$(OBJ)/LYBookmark.obj :  src/LYBookmark.c
+LYBookmark.obj :  src/LYBookmark.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYBookmark.c
 |
 
-$(OBJ)/LYCgi.obj :  src/LYCgi.c
+LYCgi.obj :  src/LYCgi.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYCgi.c
 |
 
-$(OBJ)/LYCharSets.obj :  src/LYCharSets.c
+LYCharSets.obj :  src/LYCharSets.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYCharSets.c
 |
 
-$(OBJ)/LYCharUtils.obj :  src/LYCharUtils.c
+LYCharUtils.obj :  src/LYCharUtils.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYCharUtils.c
 |
 
-$(OBJ)/LYClean.obj :  src/LYClean.c
+LYClean.obj :  src/LYClean.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYClean.c
 |
 
-$(OBJ)/LYCookie.obj :  src/LYCookie.c
+LYCookie.obj :  src/LYCookie.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYCookie.c
 |
 
-$(OBJ)/LYCurses.obj :  src/LYCurses.c
+LYCurses.obj :  src/LYCurses.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYCurses.c
 |
 
-$(OBJ)/LYDownload.obj :  src/LYDownload.c
+LYDownload.obj :  src/LYDownload.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYDownload.c
 |
 
-$(OBJ)/LYEdit.obj :  src/LYEdit.c
+LYEdit.obj :  src/LYEdit.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYEdit.c
 |
 
-$(OBJ)/LYEditmap.obj :  src/LYEditmap.c
+LYEditmap.obj :  src/LYEditmap.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYEditmap.c
 |
 
-$(OBJ)/LYExit.obj :  src/LYExit.c
+LYExit.obj :  src/LYExit.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYExit.c
 |
 
-$(OBJ)/LYExtern.obj :  src/LYExtern.c
+LYExtern.obj :  src/LYExtern.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYExtern.c
 |
 
-$(OBJ)/LYForms.obj :  src/LYForms.c
+LYForms.obj :  src/LYForms.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYForms.c
 |
 
-$(OBJ)/LYGetFile.obj :  src/LYGetFile.c
+LYGetFile.obj :  src/LYGetFile.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYGetFile.c
 |
 
-$(OBJ)/LYHash.obj :  src/LYHash.c
+LYHash.obj :  src/LYHash.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYHash.c
 |
 
-$(OBJ)/LYHistory.obj :  src/LYHistory.c
+LYHistory.obj :  src/LYHistory.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYHistory.c
 |
 
-$(OBJ)/LYJump.obj :  src/LYJump.c
+LYJump.obj :  src/LYJump.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYJump.c
 |
 
-$(OBJ)/LYKeymap.obj :  src/LYKeymap.c
+LYKeymap.obj :  src/LYKeymap.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYKeymap.c
 |
 
-$(OBJ)/LYLeaks.obj :  src/LYLeaks.c
+LYLeaks.obj :  src/LYLeaks.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYLeaks.c
 |
 
-$(OBJ)/LYList.obj :  src/LYList.c
+LYList.obj :  src/LYList.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYList.c
 |
 
-$(OBJ)/LYLocal.obj :  src/LYLocal.c
+LYLocal.obj :  src/LYLocal.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYLocal.c
 |
 
-$(OBJ)/LYMail.obj :  src/LYMail.c
+LYMail.obj :  src/LYMail.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYMail.c
 |
 
-$(OBJ)/LYMain.obj :  src/LYMain.c
+LYMain.obj :  src/LYMain.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYMain.c
 |
 
-$(OBJ)/LYMainLoop.obj :  src/LYMainLoop.c
+LYMainLoop.obj :  src/LYMainLoop.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYMainLoop.c
 |
 
-$(OBJ)/LYMap.obj :  src/LYMap.c
+LYMap.obj :  src/LYMap.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYMap.c
 |
 
-$(OBJ)/LYNews.obj :  src/LYNews.c
+LYNews.obj :  src/LYNews.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYNews.c
 |
 
-$(OBJ)/LYOptions.obj :  src/LYOptions.c
+LYOptions.obj :  src/LYOptions.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYOptions.c
 |
 
-$(OBJ)/LYPrint.obj :  src/LYPrint.c
+LYPrint.obj :  src/LYPrint.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYPrint.c
 |
 
-$(OBJ)/LYPrettySrc.obj :  src/LYPrettySrc.c
+LYPrettySrc.obj :  src/LYPrettySrc.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYPrettySrc.c
 |
 
-$(OBJ)/LYmktime.obj :  src/LYmktime.c
+LYmktime.obj :  src/LYmktime.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYmktime.c
 |
 
-$(OBJ)/LYrcFile.obj :  src/LYrcFile.c
+LYrcFile.obj :  src/LYrcFile.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYrcFile.c
 |
 
-$(OBJ)/LYReadCFG.obj :  src/LYReadCFG.c
+LYReadCFG.obj :  src/LYReadCFG.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYReadCFG.c
 |
 
-$(OBJ)/LYSearch.obj :  src/LYSearch.c
+LYSearch.obj :  src/LYSearch.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYSearch.c
 |
 
-$(OBJ)/LYSession.obj :  src/LYSession.c
+LYSession.obj :  src/LYSession.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYSession.c
 |
 
-$(OBJ)/LYShowInfo.obj :  src/LYShowInfo.c
+LYShowInfo.obj :  src/LYShowInfo.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYShowInfo.c
 |
 
-$(OBJ)/LYStrings.obj :  src/LYStrings.c
+LYStrings.obj :  src/LYStrings.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYStrings.c
 |
 
-$(OBJ)/LYStyle.obj :  src/LYStyle.c
+LYStyle.obj :  src/LYStyle.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYStyle.c
 |
 
-$(OBJ)/LYTraversal.obj :  src/LYTraversal.c
+LYTraversal.obj :  src/LYTraversal.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYTraversal.c
 |
 
-$(OBJ)/LYUpload.obj :  src/LYUpload.c
+LYUpload.obj :  src/LYUpload.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYUpload.c
 |
 
-$(OBJ)/LYUtils.obj :  src/LYUtils.c
+LYUtils.obj :  src/LYUtils.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYUtils.c
 |
 
-$(OBJ)/parsdate.obj :  src/parsdate.c
+parsdate.obj :  src/parsdate.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/parsdate.c
 |
 
-$(OBJ)/TRSTable.obj :  src/TRSTable.c
+TRSTable.obj :  src/TRSTable.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/TRSTable.c
 |
 
-$(OBJ)/Xsystem.obj :  src/Xsystem.c
+Xsystem.obj :  src/Xsystem.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/Xsystem.c
 |
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index c5006ce9..b352f91a 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.131 2011/06/05 20:38:08 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.132 2012/07/04 23:34:06 tom Exp $
  *
  * global variable definitions
  */
@@ -651,8 +651,8 @@ extern "C" {
     extern BOOLEAN system_is_NT;
     extern char windows_drive[4];
     extern int lynx_timeout;
-    CRITICAL_SECTION critSec_DNS;
-    CRITICAL_SECTION critSec_READ;
+    extern CRITICAL_SECTION critSec_DNS;
+    extern CRITICAL_SECTION critSec_READ;
 #endif				/* _WINDOWS */
 
     extern BOOLEAN show_cfg;
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 9d2131a5..781034ad 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.221 2012/02/10 18:22:50 tom Exp $
+ * $LynxId: LYUtils.c,v 1.222 2012/07/05 00:56:21 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -18,12 +18,17 @@ extern int kbhit(void);		/* FIXME: use conio.h */
 
 #ifdef DONT_USE_GETTEXT
 #undef gettext
+#elif defined(HAVE_GETTEXT)
+#undef gettext
+#define gettext conio_gettext
 #endif
 
 #include <conio.h>
 
 #ifdef DONT_USE_GETTEXT
 #define gettext(s) s
+#elif defined(HAVE_GETTEXT)
+#undef gettext
 #endif
 
 #if !defined(kbhit) && defined(_WCONIO_DEFINED)
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index e76e0f6f..1cd6a28d 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: makeuctb.c,v 1.46 2010/09/24 09:52:56 tom Exp $
+ * $LynxId: makeuctb.c,v 1.47 2012/07/04 20:58:29 tom Exp $
  *
  *  makeuctb.c, derived from conmakehash.c   - kw
  *
@@ -30,7 +30,7 @@
 #define DONT_USE_SOCKS5
 #include <UCDefs.h>
 #include <UCkd.h>
-#include <LYUtils.h>
+#include <ctype.h>
 
 /*
  *  Don't try to use LYexit() since this is a standalone file.
@@ -88,7 +88,7 @@ static void usage(void)
 }
 
 #ifdef USE_ASCII_CTYPES
-int ascii_tolower(int i)
+static int ascii_tolower(int i)
 {
     if (91 > i && i > 64)
 	return (i + 32);