1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-31 21:57:12 +00:00
freebsd-ports/japanese/iv/files/patch-bd
Shigeyuki Fukushima d0094e951a Fix build error under 4-current and new egcs/C++ compiler.
PR:		ports/16024
Submitted by:	MIHIRA Yoshiro <sanpei@sanpei.org>
2000-01-11 15:52:35 +00:00

43 lines
1.2 KiB
Plaintext

--- src/lib/Unidraw/catalog.c.orig Sat Dec 12 13:27:55 1992
+++ src/lib/Unidraw/catalog.c Mon Jan 3 15:13:19 2000
@@ -57,7 +57,9 @@
#include <IV-2_6/_enter.h>
#include <ctype.h>
+#if __FreeBSD_cc_version < 400002
#include <osfcn.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -65,6 +67,8 @@
#include <strstream.h>
#ifdef SYSV
#include <OS/types.h>
+#endif
+#if defined(SYSV) || __FreeBSD_cc_version >= 400003
#include <unistd.h>
#endif
#include <sys/file.h>
@@ -1502,7 +1506,8 @@
in >> graylevel;
} else if (graylevel == nograylevel) {
- for (int i = 0; in >> buf && i < patternHeight; i++) {
+ int i;
+ for (i = 0; in >> buf && i < patternHeight; i++) {
if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
break;
}
@@ -1610,8 +1615,9 @@
} else {
istrstream in(definition, strlen(definition) + 1);
int data[patternHeight];
+ int i;
- for (int i = 0; in >> buf && i < patternHeight; i++) {
+ for (i = 0; in >> buf && i < patternHeight; i++) {
if (sscanf(buf, "%x", &data[i]) != 1) {
break;
}