bug-texinfo
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: texinfo-4.11 compile problems in HPUX and Tru64


From: Karl Berry
Subject: Re: texinfo-4.11 compile problems in HPUX and Tru64
Date: Sat, 15 Sep 2007 18:53:13 -0500

Hi Bert,

    Texinfo 4.11 does not compile on HPUX and Tru64, because of the use of
    macro __()

The diff below (committed to cvs) changes all use of __ to "gdt".
Can you give it a try, please, and let me know if any (hopefully new)
problems crop up?

Thanks,
Karl

Index: defun.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.17
diff -c -2 -r1.17 defun.c
*** defun.c     1 Jul 2007 21:20:32 -0000       1.17
--- defun.c     15 Sep 2007 23:44:05 -0000
***************
*** 400,425 ****
      case defun:
      case deftypefun:
!       category = __("Function");
        break;
      case defmac:
!       category = __("Macro");
        break;
      case defspec:
!       category = __("Special Form");
        break;
      case defvar:
      case deftypevar:
!       category = __("Variable");
        break;
      case defopt:
!       category = __("User Option");
        break;
      case defivar:
      case deftypeivar:
!       category = __("Instance Variable");
        break;
      case defmethod:
      case deftypemethod:
!       category = __("Method");
        break;
      default:
--- 400,425 ----
      case defun:
      case deftypefun:
!       category = gdt("Function");
        break;
      case defmac:
!       category = gdt("Macro");
        break;
      case defspec:
!       category = gdt("Special Form");
        break;
      case defvar:
      case deftypevar:
!       category = gdt("Variable");
        break;
      case defopt:
!       category = gdt("User Option");
        break;
      case defivar:
      case deftypeivar:
!       category = gdt("Instance Variable");
        break;
      case defmethod:
      case deftypemethod:
!       category = gdt("Method");
        break;
      default:
***************
*** 497,518 ****
          break;
        case defcv:
!         execute_string (" --- %s %s %s: %s", category, __("of"), type_name,
                          defined_name);
          break;
        case deftypecv:
        case deftypeivar:
!         execute_string (" --- %s %s %s: %s %s", category, __("of"), type_name,
                          type_name2, defined_name);
          break;
        case defop:
!         execute_string (" --- %s %s %s: %s", category, __("on"), type_name,
                          defined_name);
          break;
        case deftypeop:
!         execute_string (" --- %s %s %s: %s %s", category, __("on"), type_name,
                          type_name2, defined_name);
          break;
        case deftypemethod:
!         execute_string (" --- %s %s %s: %s %s", category, __("on"), type_name,
                          type_name2, defined_name);
          break;
--- 497,518 ----
          break;
        case defcv:
!         execute_string (" --- %s %s %s: %s", category, gdt("of"), type_name,
                          defined_name);
          break;
        case deftypecv:
        case deftypeivar:
!         execute_string (" --- %s %s %s: %s %s", category, gdt("of"), 
type_name,
                          type_name2, defined_name);
          break;
        case defop:
!         execute_string (" --- %s %s %s: %s", category, gdt("on"), type_name,
                          defined_name);
          break;
        case deftypeop:
!         execute_string (" --- %s %s %s: %s %s", category, gdt("on"), 
type_name,
                          type_name2, defined_name);
          break;
        case deftypemethod:
!         execute_string (" --- %s %s %s: %s %s", category, gdt("on"), 
type_name,
                          type_name2, defined_name);
          break;
***************
*** 542,546 ****
          case deftypecv:
          case deftypeivar:
!         execute_string ("--- %s %s %s: ", category, __("of"), type_name);
          break;
  
--- 542,546 ----
          case deftypecv:
          case deftypeivar:
!         execute_string ("--- %s %s %s: ", category, gdt("of"), type_name);
          break;
  
***************
*** 548,552 ****
          case deftypemethod:
          case deftypeop:
!         execute_string ("--- %s %s %s: ", category, __("on"), type_name);
          break;
        } /* switch (base_type)... */
--- 548,552 ----
          case deftypemethod:
          case deftypeop:
!         execute_string ("--- %s %s %s: ", category, gdt("on"), type_name);
          break;
        } /* switch (base_type)... */
***************
*** 641,645 ****
        break;
        case deftypeivar:
!       execute_string ("@vindex %s %s %s\n", defined_name, __("of"),
                          type_name);
        break;
--- 641,645 ----
        break;
        case deftypeivar:
!       execute_string ("@vindex %s %s %s\n", defined_name, gdt("of"),
                          type_name);
        break;
***************
*** 647,651 ****
        case deftypeop:
        case deftypemethod:
!       execute_string ("@findex %s %s %s\n", defined_name, __("on"),
                          type_name);
        break;
--- 647,651 ----
        case deftypeop:
        case deftypemethod:
!       execute_string ("@findex %s %s %s\n", defined_name, gdt("on"),
                          type_name);
        break;
Index: html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.39
diff -c -2 -r1.39 html.c
*** html.c      1 Jul 2007 21:20:32 -0000       1.39
--- html.c      15 Sep 2007 23:44:06 -0000
***************
*** 201,205 ****
    if (!html_title)
      html_title = escape_string (title ?
!         text_expansion (title) : (char *) __("Untitled"));
  
    /* Make sure this is the very first string of the output document.  */
--- 201,205 ----
    if (!html_title)
      html_title = escape_string (title ?
!         text_expansion (title) : (char *) gdt("Untitled"));
  
    /* Make sure this is the very first string of the output document.  */
Index: makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.105
diff -c -2 -r1.105 makeinfo.c
*** makeinfo.c  3 Sep 2007 12:06:29 -0000       1.105
--- makeinfo.c  15 Sep 2007 23:44:12 -0000
***************
*** 2609,2613 ****
  info_output_head (void)
  {
!   add_word_args (__("This is %s, produced by makeinfo version %s from %s.\n"),
                   output_filename, VERSION, input_filename);
  
--- 2609,2613 ----
  info_output_head (void)
  {
!   add_word_args (gdt("This is %s, produced by makeinfo version %s from 
%s.\n"),
                   output_filename, VERSION, input_filename);
  
Index: makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.29
diff -c -2 -r1.29 makeinfo.h
*** makeinfo.h  11 Jul 2007 00:16:24 -0000      1.29
--- makeinfo.h  15 Sep 2007 23:44:12 -0000
***************
*** 319,326 ****
  } GENERIC_LIST;
  
! /* Use __ instead of _ to translate strings that end up in the output
!    document.  */
  extern char *getdocumenttext (const char *msgid);
! #define __(s) getdocumenttext(s)
  
  /* Reverse the order of a list.  */
--- 319,326 ----
  } GENERIC_LIST;
  
! /* Use `gdt' instead of `_' to translate strings that end up in the
!    output document.  */
  extern char *getdocumenttext (const char *msgid);
! #define gdt(s) getdocumenttext(s)
  
  /* Reverse the order of a list.  */
Index: node.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.37
diff -c -2 -r1.37 node.c
*** node.c      8 Jul 2007 13:11:48 -0000       1.37
--- node.c      15 Sep 2007 23:44:14 -0000
***************
*** 989,993 ****
              {
                tem = expansion (next, 0);
!             add_word ((char *) __("Next:"));
                add_word (" ");
                
--- 989,993 ----
              {
                tem = expansion (next, 0);
!             add_word ((char *) gdt("Next:"));
                add_word (" ");
                
***************
*** 1005,1009 ****
              {
                tem = expansion (prev, 0);
!             add_word ((char *) __("Previous:"));
                add_word (" ");
              add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
--- 1005,1009 ----
              {
                tem = expansion (prev, 0);
!             add_word ((char *) gdt("Previous:"));
                add_word ("&nbsp;");
              add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
***************
*** 1019,1023 ****
              {
                tem = expansion (up, 0);
!             add_word ((char *) __("Up:"));
                add_word ("&nbsp;");
              add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
--- 1019,1023 ----
              {
                tem = expansion (up, 0);
!             add_word ((char *) gdt("Up:"));
                add_word ("&nbsp;");
              add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
***************
*** 1374,1380 ****
      {
      case menu_reference:
!       return __("Menu");
      case followed_reference:
!       return __("Cross");
      default:
        return "Internal-bad-reference-type";
--- 1374,1380 ----
      {
      case menu_reference:
!       return gdt("Menu");
      case followed_reference:
!       return gdt("Cross");
      default:
        return "Internal-bad-reference-type";
***************
*** 1435,1439 ****
        if (tags->next)
          {
!           validate (tags->next, tags->line_no, __("Next"));
  
            /* If the Next node exists, and there is no Up, then make sure
--- 1435,1439 ----
        if (tags->next)
          {
!           validate (tags->next, tags->line_no, gdt("Next"));
  
            /* If the Next node exists, and there is no Up, then make sure
***************
*** 1473,1477 ****
        if (!(tags->flags & TAG_FLAG_PREV_ERROR) && tags->prev)
          {
!           int valid_p = validate (tags->prev, tags->line_no, __("Prev"));
  
            if (!valid_p)
--- 1473,1477 ----
        if (!(tags->flags & TAG_FLAG_PREV_ERROR) && tags->prev)
          {
!           int valid_p = validate (tags->prev, tags->line_no, gdt("Prev"));
  
            if (!valid_p)
***************
*** 1535,1539 ****
        else if (tags->up)
          {
!           int valid_p = validate (tags->up, tags->line_no, __("Up"));
  
            /* If node X has Up: Y, then warn if Y fails to have a menu item
--- 1535,1539 ----
        else if (tags->up)
          {
!           int valid_p = validate (tags->up, tags->line_no, gdt("Up"));
  
            /* If node X has Up: Y, then warn if Y fails to have a menu item
Index: toc.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.10
diff -c -2 -r1.10 toc.c
*** toc.c       1 Jul 2007 21:20:33 -0000       1.10
--- toc.c       15 Sep 2007 23:44:15 -0000
***************
*** 195,199 ****
        return;
  
!   add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", 
__("Table of Contents"));
  
    last_level = toc_entry_alist[0]->level;
--- 195,199 ----
        return;
  
!   add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", 
gdt("Table of Contents"));
  
    last_level = toc_entry_alist[0]->level;
***************
*** 269,275 ****
        return;
  
!   insert_string ((char *) __("Table of Contents"));
    insert ('\n');
!   for (i = 0; i < strlen (__("Table of Contents")); i++)
      insert ('*');
    insert_string ("\n\n");
--- 269,275 ----
        return;
  
!   insert_string ((char *) gdt("Table of Contents"));
    insert ('\n');
!   for (i = 0; i < strlen (gdt("Table of Contents")); i++)
      insert ('*');
    insert_string ("\n\n");
***************
*** 302,306 ****
      return;
  
!   add_html_block_elt_args ("\n<div 
class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", __("Short Contents"));
  
    if (contents_filename)
--- 302,306 ----
      return;
  
!   add_html_block_elt_args ("\n<div 
class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", gdt("Short Contents"));
  
    if (contents_filename)
***************
*** 335,341 ****
        return;
  
!   insert_string ((char *) __("Short Contents"));
    insert ('\n');
!   for (i = 0; i < strlen (__("Short Contents")); i++)
      insert ('*');
    insert_string ("\n\n");
--- 335,341 ----
        return;
  
!   insert_string ((char *) gdt("Short Contents"));
    insert ('\n');
!   for (i = 0; i < strlen (gdt("Short Contents")); i++)
      insert ('*');
    insert_string ("\n\n");
Index: xref.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.12
diff -c -2 -r1.12 xref.c
*** xref.c      1 Jul 2007 21:20:33 -0000       1.12
--- xref.c      15 Sep 2007 23:44:15 -0000
***************
*** 131,135 ****
            if (!ref_flag)
              add_word (px_ref_flag || printing_index
!                 ? (char *) __("see ") : (char *) __("See "));
  
            if (!*arg4 && !*arg5)
--- 131,135 ----
            if (!ref_flag)
              add_word (px_ref_flag || printing_index
!                 ? (char *) gdt("see ") : (char *) gdt("See "));
  
            if (!*arg4 && !*arg5)
***************
*** 155,159 ****
            else if (*arg5)
              {
!               add_word_args (__("See section ``%s'' in "), *arg3 ? arg3 : 
arg1);
                xml_insert_element (CITE, START);
                add_word (arg5);
--- 155,159 ----
            else if (*arg5)
              {
!               add_word_args (gdt("See section ``%s'' in "), *arg3 ? arg3 : 
arg1);
                xml_insert_element (CITE, START);
                add_word (arg5);
***************
*** 168,172 ****
          {
            if (!ref_flag)
!             add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
  
            xml_insert_element (XREF, START);
--- 168,172 ----
          {
            if (!ref_flag)
!             add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
  
            xml_insert_element (XREF, START);
***************
*** 203,207 ****
          {
            if (!ref_flag)
!             add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
          }
        else
--- 203,207 ----
          {
            if (!ref_flag)
!             add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
          }
        else
***************
*** 457,461 ****
            char *tem;
  
!           add_word ((char *) __("see "));
            /* html fixxme: revisit this */
            add_html_elt ("<a href=");
--- 457,461 ----
            char *tem;
  
!           add_word ((char *) gdt("see "));
            /* html fixxme: revisit this */
            add_html_elt ("<a href=");




reply via email to

[Prev in Thread] Current Thread [Next in Thread]