2000-01-25 02:35:00 +00:00
|
|
|
--- src/lib/Unidraw/catalog.c.orig Tue May 25 06:29:33 1993
|
|
|
|
+++ src/lib/Unidraw/catalog.c Sun Jan 23 19:23:39 2000
|
|
|
|
@@ -58,7 +58,8 @@
|
1999-05-30 02:39:07 +00:00
|
|
|
#include <IV-2_6/_enter.h>
|
|
|
|
|
|
|
|
#include <ctype.h>
|
2000-01-25 02:35:00 +00:00
|
|
|
-#ifndef __DECCXX
|
|
|
|
+/*#ifndef __DECCXX*/
|
|
|
|
+#if !defined(__DECCXX) || (__FreeBSD_cc_version < 400002)
|
1999-05-30 02:39:07 +00:00
|
|
|
#include <osfcn.h>
|
1999-12-29 07:47:39 +00:00
|
|
|
#endif
|
2000-01-25 02:35:00 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
@@ -1504,7 +1505,8 @@
|
1999-12-29 07:47:39 +00:00
|
|
|
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;
|
|
|
|
}
|
2000-01-25 02:35:00 +00:00
|
|
|
@@ -1611,9 +1613,9 @@
|
1999-12-29 07:47:39 +00:00
|
|
|
|
|
|
|
} else {
|
|
|
|
istrstream in(definition, strlen(definition) + 1);
|
|
|
|
- int data[patternHeight];
|
|
|
|
+ int data[patternHeight], 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;
|
|
|
|
}
|