snapshot of project "lynx", label v2-8-2pre_2

5 files changed, 20 insertions, 22 deletions

diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index d845ca02..cddfa1c4 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -663,7 +663,7 @@ PUBLIC char * HTAA_UidToName ARGS1(int, uid)
 		    "HTAA_UidToName: getpwuid",
 		    uid,
 		    pw->pw_name, (int) pw->pw_uid);
-	save_uid_info(pw->pw_name, pw->pw_uid);
+	save_uid_info(pw->pw_name, (int) pw->pw_uid);
 	return pw->pw_name;
     }
 #endif
@@ -695,8 +695,8 @@ PUBLIC int HTAA_NameToUid ARGS1(char *, name)
 		    "HTAA_NameToUid: getpwnam",
 		    name,
 		    pw->pw_name, (int) pw->pw_uid);
-	save_uid_info(pw->pw_name, pw->pw_uid);
-	return pw->pw_uid;
+	save_uid_info(pw->pw_name, (int) pw->pw_uid);
+	return (int) pw->pw_uid;
     }
 #endif
     return NONESUCH;
@@ -728,7 +728,7 @@ PUBLIC char * HTAA_GidToName ARGS1(int, gid)
 		    "HTAA_GidToName: getgrgid",
 		    gid,
 		    gr->gr_name, (int) gr->gr_gid);
-	save_gid_info(gr->gr_name, gr->gr_gid);
+	save_gid_info(gr->gr_name, (int) gr->gr_gid);
 	return gr->gr_name;
     }
 #endif
@@ -760,8 +760,8 @@ PUBLIC int HTAA_NameToGid ARGS1(char *, name)
 		    "HTAA_NameToGid: getgrnam",
 		    name,
 		    gr->gr_name, (int) gr->gr_gid);
-	save_gid_info(gr->gr_name, gr->gr_gid);
-	return gr->gr_gid;
+	save_gid_info(gr->gr_name, (int) gr->gr_gid);
+	return (int) gr->gr_gid;
     }
 #endif
     return NONESUCH;
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index c90c63d1..43910104 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -325,7 +325,7 @@ PRIVATE void LYListFmtParse ARGS5(
 			break;
 
 		case 's':	/* size in bytes */
-			FormatNum(&buf, start, st.st_size);
+			FormatNum(&buf, start, (int) st.st_size);
 			break;
 
 		case 'K':	/* size in Kilobytes but not for directories */
@@ -335,7 +335,7 @@ PRIVATE void LYListFmtParse ARGS5(
 			}
 			/* FALL THROUGH */
 		case 'k':	/* size in Kilobytes */
-			FormatNum(&buf, start, (st.st_size+1023)/1024);
+			FormatNum(&buf, start, (int)((st.st_size+1023)/1024));
 			StrAllocCat(buf, "K");
 			break;
 
@@ -374,7 +374,7 @@ PRIVATE void LYListFmtParse ARGS5(
 			if (*name) {
 				FormatStr(&buf, start, name);
 			} else {
-				FormatNum(&buf, start, st.st_uid);
+				FormatNum(&buf, start, (int) st.st_uid);
 			}
 			break;
 
@@ -383,12 +383,12 @@ PRIVATE void LYListFmtParse ARGS5(
 			if (*name) {
 				FormatStr(&buf, start, name);
 			} else {
-				FormatNum(&buf, start, st.st_gid);
+				FormatNum(&buf, start, (int) st.st_gid);
 			}
 			break;
 
 		case 'l':	/* link count */
-			FormatNum(&buf, start, st.st_nlink);
+			FormatNum(&buf, start, (int) st.st_nlink);
 			break;
 
 		case '%':	/* literal % with flags/width */
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 6beb2f44..4e12d159 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -564,8 +564,8 @@ PRIVATE char * StrAllocVsprintf ARGS4(
 	}
     }
 
-    free(tmp_ptr);
-    free(fmt_ptr);
+    FREE(tmp_ptr);
+    FREE(fmt_ptr);
     dst_ptr[dst_len] = '\0';
     if (pstr)
     	*pstr = dst_ptr;
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 6c8e43e8..19def689 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -19,14 +19,16 @@ LYFLAGS		= # FIXME: set in parent makefile
 CC		= @CC@
 DEFS		= @DEFS@
 CPPFLAGS	= @CPPFLAGS@
+
+INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
+
 CPPOPTS		= $(DEFS) $(CPPFLAGS) $(LYFLAGS) \
 		-I../../.. \
 		-I../../../src \
-		-I../../../intl \
 		-I$(top_srcdir) \
 		-I$(top_srcdir)/src \
-		-I$(top_srcdir)/intl \
-		-I$(WWWINC)
+		$(INTLDIR_CPPFLAGS) -I$(WWWINC)
+
 LY_CFLAGS	= @CFLAGS@
 CFLAGS		= $(CPPOPTS) $(LY_CFLAGS)
 LINT		= @LINT@
diff --git a/WWW/Library/Implementation/tcp.h b/WWW/Library/Implementation/tcp.h
index 7a3d048f..c9d05dfa 100644
--- a/WWW/Library/Implementation/tcp.h
+++ b/WWW/Library/Implementation/tcp.h
@@ -513,13 +513,9 @@ struct timeval {
 #include <sys/filio.h>
 #endif /* HAVE_SYS_FILIO_H */
 
-/*
-MIPS unix
- */
-/* Mips hack (bsd4.3/sysV mixture...) */
-#ifdef mips
+#ifdef DECL_ERRNO
 extern int errno;
-#endif /* mips */
+#endif /* DECL_ERRNO */
 
 /*
 Regular BSD unix versions