[Groff-commit] groff ./ChangeLog src/preproc/preconv/preconv.cpp

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/04/25 18:51:29

Modified files:
        .              : ChangeLog 
        src/preproc/preconv: preconv.cpp 

Log message:
        * src/preproc/preconv/preconv.cpp (do_file): Fix conditional
        preprocessor expression (I18N -> HAVE_ICONV).
        (main): Fix handling of option `-h'.
        Fix conditional preprocessor expression.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.948&tr2=1.949&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.948 groff/ChangeLog:1.949
--- groff/ChangeLog:1.948       Tue Apr  4 20:20:03 2006
+++ groff/ChangeLog     Tue Apr 25 18:51:29 2006
@@ -1,3 +1,10 @@
+2006-04-25  Tetsurou Okazaki  <address@hidden>
+
+       * src/preproc/preconv/preconv.cpp (do_file): Fix conditional
+       preprocessor expression (I18N -> HAVE_ICONV).
+       (main): Fix handling of option `-h'.
+       Fix conditional preprocessor expression.
+
 2006-04-04  Werner LEMBERG  <address@hidden>
 
        Implement new number register `.br' which is set to 1 if a macro has
Index: groff/src/preproc/preconv/preconv.cpp
diff -u groff/src/preproc/preconv/preconv.cpp:1.11 
groff/src/preproc/preconv/preconv.cpp:1.12
--- groff/src/preproc/preconv/preconv.cpp:1.11  Thu Feb 23 20:07:25 2006
+++ groff/src/preproc/preconv/preconv.cpp       Tue Apr 25 18:51:29 2006
@@ -1074,7 +1074,7 @@
 #else
     error("encoding system `%1' not supported", encoding);
     success = 0;
-#endif /* I18N */
+#endif /* HAVE_ICONV */
   }
   if (fp != stdin)
     fclose(fp);
@@ -1119,7 +1119,7 @@
   program_name = argv[0];
   int opt;
   static const struct option long_options[] = {
-    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "help", no_argument, 0, 'h' },
     { "version", no_argument, 0, 'v' },
     { NULL, 0, 0, 0 }
   };
@@ -1130,11 +1130,11 @@
     case 'v':
       printf("GNU preconv (groff) version %s %s iconv support\n",
             Version_string,
-#ifdef I18N
+#ifdef HAVE_ICONV
             "with"
 #else
             "without"
-#endif /* I18N */
+#endif /* HAVE_ICONV */
            );
       exit(0);
       break;
@@ -1152,7 +1152,7 @@
     case 'r':
       raw_flag = 1;
       break;
-    case CHAR_MAX + 1: // --help
+    case 'h':
       usage(stdout);
       exit(0);
       break;