3 files changed, 7 insertions, 11 deletions
diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c
index ce866bfe..5e22915b 100644
--- a/WWW/Library/Implementation/HTDOS.c
+++ b/WWW/Library/Implementation/HTDOS.c
@@ -4,7 +4,7 @@
 
 #include <mem.h>
 #include <dos.h>
-#include "htstring.h"
+
 
 /* PUBLIC							HTDOS_wwwName()
 **		CONVERTS DOS Name into WWW Name
@@ -59,7 +59,6 @@ char * HTDOS_name(char *wwwname)
 	int joe;
 
 	memset(cp_url, 0, 1023);
-/*	strset(cp_url,0);                 */
 	sprintf(cp_url, "%s",wwwname);
 
 	for(joe = 0; cp_url[joe] != '\0'; joe++)	{
@@ -82,16 +81,14 @@ char * HTDOS_name(char *wwwname)
 		printf("\n\n%s = i%\n\n",cp_url,strlen(cp_url));
 		sleep(5);
 #endif
-      strcpy(wwwname, cp_url);
-      return(wwwname); /* return(cp_url); */
+		strcpy(wwwname, cp_url);
+		return(wwwname); /* return(cp_url); */
 	} else {
 #if 0
 		printf("\n\n%s = %i\n\n",cp_url+1,strlen(cp_url));
 		sleep(5);
 #endif
-      strcpy(wwwname, cp_url+1);
-      return(wwwname); /* return(cp_url+1);  */
+		strcpy(wwwname, cp_url+1);
+		return(wwwname); /* return(cp_url+1);  */
 	}
 }
-
-
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 9a2b8ec8..89a93d14 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -26,7 +26,6 @@
 #endif /* !VMS */
 
 #ifdef DOSPATH
-#define HAVE_READDIR
 #define HAVE_READDIR 1
 #include <dirent.h>
 #define USE_DIRENT
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 63025052..21128bb9 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -424,8 +424,8 @@ Upper- and Lowercase macros
 
 #ifndef TOLOWER
   /* Pyramid and Mips can't uppercase non-alpha */
-#define TOLOWER(c) (isupper((unsigned char)c) ? tolower((unsigned char)c) : (c))
-#define TOUPPER(c) (islower((unsigned char)c) ? toupper((unsigned char)c) : (c))
+#define TOLOWER(c) (isupper((unsigned char)c) ? tolower((unsigned char)c) : ((unsigned char)c))
+#define TOUPPER(c) (islower((unsigned char)c) ? toupper((unsigned char)c) : ((unsigned char)c))
 #endif /* TOLOWER */
 
 /*