patch makedefs.c (no -j)

diff --git a/util/makedefs.c b/util/makedefs.c
index 0e340b4..d2dadd7 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -25,8 +25,14 @@
 /* version information */
 #ifdef SHORT_FILENAMES
 #include "patchlev.h"
+#if 1 /*JP*/
+#include "../japanese/jpatchle.h"
+#endif
 #else
 #include "patchlevel.h"
+#if 1 /*JP*/
+#include "../japanese/jpatchlevel.h"
+#endif
 #endif
 
 #include <ctype.h>
@@ -1188,6 +1194,25 @@ const char *build_date;
     return outbuf;
 }
 
+#if 1 /*JP*/
+static char *
+jversion_id_string(outbuf, build_date)
+char *outbuf;
+const char *build_date;
+{
+    char subbuf[64], versbuf[64];
+
+    subbuf[0] = '\0';
+#ifdef BETA
+    Strcat(subbuf, " Beta");
+#endif
+
+    Sprintf(outbuf, "%s JNetHack%s Version %s-%d.%d.", PORT_ID,
+           subbuf, version_string(versbuf, "."), JVERSION_MAJOR, JVERSION_MINOR);
+       return outbuf;
+}
+#endif
+
 static char *
 bannerc_string(outbuf, build_date)
 char *outbuf;
@@ -1276,6 +1301,10 @@ do_date()
     Fprintf(ofp, "#define VERSION_STRING \"%s\"\n", version_string(buf, "."));
     Fprintf(ofp, "#define VERSION_ID \\\n \"%s\"\n",
             version_id_string(buf, cbuf));
+#if 1 /*JP*/
+    Fprintf(ofp,"#define JVERSION_ID \\\n \"%s\"\n",
+           jversion_id_string(buf, cbuf));
+#endif
     Fprintf(ofp, "#define COPYRIGHT_BANNER_C \\\n \"%s\"\n",
             bannerc_string(buf, cbuf));
     Fprintf(ofp, "\n");
@@ -1660,11 +1689,18 @@ do_data()
     entry_cnt = line_cnt = 0;
     /* read through the input file and split it into two sections */
     while ((line = fgetline(ifp)) != 0) {
+#if 0 /*JP*/
         if (d_filter(line)) {
             free(line);
             continue;
         }
         if (*line > ' ') { /* got an entry name */
+#else
+            unsigned char uc;
+            uc = *((unsigned char *)line);
+            if (d_filter(line)) continue;
+            if (uc > ' ') { /* got an entry name */
+#endif
             /* first finish previous entry */
             if (line_cnt)
                 Fprintf(ofp, "%d\n", line_cnt), line_cnt = 0;
@@ -1753,6 +1789,7 @@ char *line;
 }
 
 static const char *special_oracle[] = {
+#if 0 /*JP*/
     "\"...it is rather disconcerting to be confronted with the",
     "following theorem from [Baker, Gill, and Solovay, 1975].", "",
     "Theorem 7.18  There exist recursive languages A and B such that",
@@ -1761,6 +1798,18 @@ static const char *special_oracle[] = {
     "currently available will not suffice for proving that P != NP or        "
     "  ",
     "that P == NP.\"  [Garey and Johnson, p. 185.]"
+#else
+    "\81u\8e\9f\82Ì\92è\97\9d[Baker, Gill, and Solovay, 1975]\82É\92¼\96Ê\82·\82é\82±\82Æ\82Í",
+    "\82Þ\82µ\82ë\8d¢\98f\82·\82é\82±\82Æ\82Å\82 \82é\81D",
+    "",
+    "\92è\97\9d 7.18 \8e\9f\82Ì\82æ\82¤\82È\8dÄ\8bA\93I\8c¾\8cê A\81CB\82ª\91¶\8dÝ\82·\82é",
+    "  (1)  P(A) == NP(A)\81C\82©\82Â",
+    "  (2)  P(B) != NP(B)",
+    "",
+    "\82±\82ê\82Í\8c»\8dÝ P != NP\82Å\82 \82é\82©\82Ü\82½\82Í P == NP\82Å\82 \82é\82©\82ð\8fØ\96¾\82·\82é",
+    "\97L\8cø\82È\8eè\96@\82ª\82È\82¢\82±\82Æ\82ð\8b­\82­\8e¦\82µ\82Ä\82¢\82é\81D\81v",
+    "[Garey and Johnson, p. 185.]"
+#endif
 };
 
 /*