texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Rename tp/Texinfo/XS/main/options_types.h as opti


From: Patrice Dumas
Subject: branch master updated: Rename tp/Texinfo/XS/main/options_types.h as options_data.h
Date: Tue, 22 Oct 2024 17:42:52 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 6cd95a0f1b Rename tp/Texinfo/XS/main/options_types.h as options_data.h
6cd95a0f1b is described below

commit 6cd95a0f1b3cf1373b95a1a128ddaba3151c95cb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Oct 22 23:42:43 2024 +0200

    Rename tp/Texinfo/XS/main/options_types.h as options_data.h
    
    * tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, BUILT_SOURCES)
    (MAINTAINERCLEANFILES), tp/maintain/regenerate_C_options_info.pl:
    rename main/options_types.h as options_data.h.  Report from Gavin.
    Update includes.
---
 ChangeLog                                                 |  9 +++++++++
 tp/Texinfo/XS/Makefile.am                                 | 10 +++++-----
 tp/Texinfo/XS/convert/ConvertXS.xs                        |  2 +-
 tp/Texinfo/XS/convert/convert_html.c                      |  2 +-
 tp/Texinfo/XS/convert/converter.c                         |  2 +-
 tp/Texinfo/XS/convert/converters_options.c                |  2 +-
 tp/Texinfo/XS/convert/converters_options.h                |  2 +-
 tp/Texinfo/XS/convert/format_html.c                       |  2 +-
 tp/Texinfo/XS/convert/get_converter_perl_info.c           |  2 +-
 tp/Texinfo/XS/convert/texinfo.c                           |  2 +-
 tp/Texinfo/XS/main/DocumentXS.xs                          |  2 +-
 tp/Texinfo/XS/main/build_perl_info.h                      |  2 +-
 tp/Texinfo/XS/main/convert_to_text.c                      |  2 +-
 tp/Texinfo/XS/main/convert_to_text.h                      |  2 +-
 tp/Texinfo/XS/main/convert_utils.c                        |  2 +-
 tp/Texinfo/XS/main/convert_utils.h                        |  2 +-
 tp/Texinfo/XS/main/converter_types.h                      |  2 +-
 tp/Texinfo/XS/main/customization_options.c                |  2 +-
 tp/Texinfo/XS/main/customization_options.h                |  2 +-
 tp/Texinfo/XS/main/document.c                             |  2 +-
 tp/Texinfo/XS/main/document.h                             |  2 +-
 tp/Texinfo/XS/main/errors.h                               |  2 +-
 tp/Texinfo/XS/main/get_perl_info.c                        |  2 +-
 tp/Texinfo/XS/main/get_perl_info.h                        |  2 +-
 tp/Texinfo/XS/main/{options_types.h => options_data.h}    |  4 ++--
 tp/Texinfo/XS/main/options_defaults.c                     |  2 +-
 tp/Texinfo/XS/main/options_defaults.h                     |  2 +-
 tp/Texinfo/XS/main/options_get_perl.c                     |  2 +-
 tp/Texinfo/XS/main/options_init_free.c                    |  2 +-
 tp/Texinfo/XS/main/translations.c                         |  2 +-
 tp/Texinfo/XS/main/translations.h                         |  2 +-
 tp/Texinfo/XS/main/utils.c                                |  2 +-
 tp/Texinfo/XS/main/utils.h                                |  2 +-
 tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs |  2 +-
 tp/Texinfo/XS/structuring_transfo/structuring.c           |  2 +-
 tp/Texinfo/XS/structuring_transfo/structuring.h           |  2 +-
 tp/maintain/regenerate_C_options_info.pl                  | 14 +++++++-------
 37 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef5023cd4b..ab6d5ced50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-10-22  Patrice Dumas  <pertusus@free.fr>
+
+       Rename tp/Texinfo/XS/main/options_types.h as options_data.h
+
+       * tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, BUILT_SOURCES)
+       (MAINTAINERCLEANFILES), tp/maintain/regenerate_C_options_info.pl:
+       rename main/options_types.h as options_data.h.  Report from Gavin.
+       Update includes.
+
 2024-10-22  Gavin Smith <gavinsmith0123@gmail.com>
 
        Move enum global_unit_direction
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 6fb4b3d663..24dcbf38cc 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -162,7 +162,7 @@ C_libtexinfo_sources = \
                      main/options_defaults.c \
                      main/options_defaults.h \
                      main/option_types.h \
-                     main/options_types.h \
+                     main/options_data.h \
                      main/global_commands_types.h \
                      main/utils.c \
                      main/utils.h \
@@ -265,7 +265,7 @@ BUILT_SOURCES = main/accent_tables_8bit_codepoints.c \
                 main/options_defaults.c \
                 main/options_defaults.h \
                 main/options_get_perl.c \
-                main/options_types.h
+                main/options_data.h
 
 # Need to be distributed
 EXTRA_DIST += main/element_types.txt main/element_types.awk \
@@ -319,20 +319,20 @@ $(srcdir)/main/accent_tables_8bit_codepoints.c: 
$(srcdir)/../../maintain/setup_a
 
 MAINTAINERCLEANFILES += main/accent_tables_8bit_codepoints.c
 
-$(srcdir)/main/options_init_free.c $(srcdir)/main/options_types.h 
$(srcdir)/main/options_defaults.c $(srcdir)/main/options_defaults.h 
$(srcdir)/convert/converters_options.c $(srcdir)/convert/converters_options.h 
$(srcdir)/main/options_get_perl.c: ../options_data.txt 
../Convert/converters_defaults.txt main/command_data.c 
$(srcdir)/../../maintain/regenerate_C_options_info.pl
+$(srcdir)/main/options_init_free.c $(srcdir)/main/options_data.h 
$(srcdir)/main/options_defaults.c $(srcdir)/main/options_defaults.h 
$(srcdir)/convert/converters_options.c $(srcdir)/convert/converters_options.h 
$(srcdir)/main/options_get_perl.c: ../options_data.txt 
../Convert/converters_defaults.txt main/command_data.c 
$(srcdir)/../../maintain/regenerate_C_options_info.pl
        $(PERL) $(srcdir)/../../maintain/regenerate_C_options_info.pl \
                < $(srcdir)/../options_data.txt \
                      $(srcdir)/main/command_data.c \
                      $(srcdir)/../Convert/converters_defaults.txt \
                      $(srcdir)/main/options_init_free.c \
-                     $(srcdir)/main/options_types.h \
+                     $(srcdir)/main/options_data.h \
                      $(srcdir)/main/options_defaults.c \
                      $(srcdir)/main/options_defaults.h \
                      $(srcdir)/convert/converters_options.c \
                      $(srcdir)/convert/converters_options.h \
                      $(srcdir)/main/options_get_perl.c
 
-MAINTAINERCLEANFILES += main/options_init_free.c main/options_types.h \
+MAINTAINERCLEANFILES += main/options_init_free.c main/options_data.h \
                         main/options_defaults.c main/options_defaults.h \
                         convert/converters_options.c \
                         convert/converters_options.h \
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index ce6e1ff2dc..56392801eb 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -38,7 +38,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "builtin_commands.h"
 #include "errors.h"
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 9e484d2f96..81e1f4e2e7 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -27,7 +27,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 #include "option_types.h"
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index f47e40b67b..d11e5d7134 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -36,7 +36,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 #include "options_defaults.h"
diff --git a/tp/Texinfo/XS/convert/converters_options.c 
b/tp/Texinfo/XS/convert/converters_options.c
index ffa3241c80..35bc2499e6 100644
--- a/tp/Texinfo/XS/convert/converters_options.c
+++ b/tp/Texinfo/XS/convert/converters_options.c
@@ -3,7 +3,7 @@
 #include <config.h>
 
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converters_options.h"
 
 /* for html_fill_button_directions_specification_list */
diff --git a/tp/Texinfo/XS/convert/converters_options.h 
b/tp/Texinfo/XS/convert/converters_options.h
index 3a8eba4c12..0f68ae91d8 100644
--- a/tp/Texinfo/XS/convert/converters_options.h
+++ b/tp/Texinfo/XS/convert/converters_options.h
@@ -4,7 +4,7 @@
 /* Automatically generated from regenerate_C_options_info.pl */
 
 #include "main/option_types.h"
-#include "main/options_types.h"
+#include "main/options_data.h"
 
 /* Undefine values set from autoconf as we use these as
    customization variable names.  The original values are
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index 2552c80ddd..bd9e0ea8e5 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -30,7 +30,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 #include "option_types.h"
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c 
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index 46f1df41d0..a766daf23a 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -32,7 +32,7 @@
 
 #include "command_ids.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "builtin_commands.h"
 #include "utils.h"
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 5d29cb4234..461595fcd3 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -29,7 +29,7 @@
 
 #include "document_types.h"
 /* txi_base_sorted_options */
-#include "options_types.h"
+#include "options_data.h"
 #include "api.h"
 #include "conf.h"
 #include "errors.h"
diff --git a/tp/Texinfo/XS/main/DocumentXS.xs b/tp/Texinfo/XS/main/DocumentXS.xs
index 69c04c4472..e8251685fc 100644
--- a/tp/Texinfo/XS/main/DocumentXS.xs
+++ b/tp/Texinfo/XS/main/DocumentXS.xs
@@ -27,7 +27,7 @@
 
 #undef context
 
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 #include "extra.h"
diff --git a/tp/Texinfo/XS/main/build_perl_info.h 
b/tp/Texinfo/XS/main/build_perl_info.h
index 45ad2bad1c..c143f50338 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -9,7 +9,7 @@
 
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 
diff --git a/tp/Texinfo/XS/main/convert_to_text.c 
b/tp/Texinfo/XS/main/convert_to_text.c
index 7fd52a14f7..b8af425baa 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -27,7 +27,7 @@
 #include "command_ids.h"
 #include "element_types.h"
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "types_data.h"
 #include "tree.h"
diff --git a/tp/Texinfo/XS/main/convert_to_text.h 
b/tp/Texinfo/XS/main/convert_to_text.h
index ab76197fa2..f36d9b48f9 100644
--- a/tp/Texinfo/XS/main/convert_to_text.h
+++ b/tp/Texinfo/XS/main/convert_to_text.h
@@ -4,7 +4,7 @@
 
 #include <stddef.h>
 
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 #include "converter_types.h"
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index 0d3e45e390..d344fa4212 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -27,7 +27,7 @@
 #include "command_ids.h"
 #include "element_types.h"
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "types_data.h"
 #include "builtin_commands.h"
 #include "tree.h"
diff --git a/tp/Texinfo/XS/main/convert_utils.h 
b/tp/Texinfo/XS/main/convert_utils.h
index f6c4bd0b7e..bd71b2c57b 100644
--- a/tp/Texinfo/XS/main/convert_utils.h
+++ b/tp/Texinfo/XS/main/convert_utils.h
@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #include "command_ids.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 #include "converter_types.h"
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index becb7dad1c..51bfee8da5 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -28,7 +28,7 @@
 #include "tree_types.h"
 #include "document_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 
 /* for interdependency with convert_to_text.h */
 struct TEXT_OPTIONS;
diff --git a/tp/Texinfo/XS/main/customization_options.c 
b/tp/Texinfo/XS/main/customization_options.c
index d3507e7593..dee247c08d 100644
--- a/tp/Texinfo/XS/main/customization_options.c
+++ b/tp/Texinfo/XS/main/customization_options.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "options_defaults.h"
 #include "api_to_perl.h"
diff --git a/tp/Texinfo/XS/main/customization_options.h 
b/tp/Texinfo/XS/main/customization_options.h
index 0077d2ac59..13c026fb2d 100644
--- a/tp/Texinfo/XS/main/customization_options.h
+++ b/tp/Texinfo/XS/main/customization_options.h
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 /* for enum command_location */
 #include "document_types.h"
 #include "converter_types.h"
diff --git a/tp/Texinfo/XS/main/document.c b/tp/Texinfo/XS/main/document.c
index 9b4d2f8717..e418fd9c14 100644
--- a/tp/Texinfo/XS/main/document.c
+++ b/tp/Texinfo/XS/main/document.c
@@ -22,7 +22,7 @@
 
 #include "command_ids.h"
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "tree.h"
 #include "errors.h"
diff --git a/tp/Texinfo/XS/main/document.h b/tp/Texinfo/XS/main/document.h
index 9ba16e501d..f92594c348 100644
--- a/tp/Texinfo/XS/main/document.h
+++ b/tp/Texinfo/XS/main/document.h
@@ -6,7 +6,7 @@
 
 #include "tree_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 
 /* avoid an interdependency with convert_to_text.h */
diff --git a/tp/Texinfo/XS/main/errors.h b/tp/Texinfo/XS/main/errors.h
index cfaa345da2..a9994af1ac 100644
--- a/tp/Texinfo/XS/main/errors.h
+++ b/tp/Texinfo/XS/main/errors.h
@@ -6,7 +6,7 @@
 #include <stdarg.h>
 
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 
 void wipe_error_message_list (ERROR_MESSAGE_LIST *error_messages);
diff --git a/tp/Texinfo/XS/main/get_perl_info.c 
b/tp/Texinfo/XS/main/get_perl_info.c
index 6ff48fc97c..2864284284 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -32,7 +32,7 @@
 #include "text.h"
 #include "command_ids.h"
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 #include "extra.h"
diff --git a/tp/Texinfo/XS/main/get_perl_info.h 
b/tp/Texinfo/XS/main/get_perl_info.h
index 4d243c7fff..43c181cdbc 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -10,7 +10,7 @@
 #include "tree_types.h"
 #include "document_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "convert_to_text.h"
 
diff --git a/tp/Texinfo/XS/main/options_types.h 
b/tp/Texinfo/XS/main/options_data.h
similarity index 99%
rename from tp/Texinfo/XS/main/options_types.h
rename to tp/Texinfo/XS/main/options_data.h
index 56310292f2..d3b0bed4d2 100644
--- a/tp/Texinfo/XS/main/options_types.h
+++ b/tp/Texinfo/XS/main/options_data.h
@@ -1,7 +1,7 @@
 /* Automatically generated from regenerate_C_options_info.pl */
 
-#ifndef OPTIONS_TYPES_H
-#define OPTIONS_TYPES_H
+#ifndef OPTIONS_DATA_H
+#define OPTIONS_DATA_H
 
 #include "option_types.h"
 
diff --git a/tp/Texinfo/XS/main/options_defaults.c 
b/tp/Texinfo/XS/main/options_defaults.c
index 26a98d273c..75521f43ef 100644
--- a/tp/Texinfo/XS/main/options_defaults.c
+++ b/tp/Texinfo/XS/main/options_defaults.c
@@ -3,7 +3,7 @@
 #include <config.h>
 
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "customization_options.h"
 #include "options_defaults.h"
 
diff --git a/tp/Texinfo/XS/main/options_defaults.h 
b/tp/Texinfo/XS/main/options_defaults.h
index 56afff5364..bad5644f1e 100644
--- a/tp/Texinfo/XS/main/options_defaults.h
+++ b/tp/Texinfo/XS/main/options_defaults.h
@@ -4,7 +4,7 @@
 /* Automatically generated from regenerate_C_options_info.pl */
 
 #include "main/option_types.h"
-#include "main/options_types.h"
+#include "main/options_data.h"
 
 /* Undefine values set from autoconf as we use these as
    customization variable names.  The original values are
diff --git a/tp/Texinfo/XS/main/options_get_perl.c 
b/tp/Texinfo/XS/main/options_get_perl.c
index 58927deebd..35476b0e42 100644
--- a/tp/Texinfo/XS/main/options_get_perl.c
+++ b/tp/Texinfo/XS/main/options_get_perl.c
@@ -1,6 +1,6 @@
 /* Automatically generated from regenerate_C_options_info.pl */
 
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 #include "get_perl_info.h"
 
diff --git a/tp/Texinfo/XS/main/options_init_free.c 
b/tp/Texinfo/XS/main/options_init_free.c
index ad80feecc0..a9a6d66a1f 100644
--- a/tp/Texinfo/XS/main/options_init_free.c
+++ b/tp/Texinfo/XS/main/options_init_free.c
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "converter_types.h"
 /* for COMMAND_OPTION_DEFAULT */
 #include "utils.h"
diff --git a/tp/Texinfo/XS/main/translations.c 
b/tp/Texinfo/XS/main/translations.c
index fb08c335ae..fb681059c7 100644
--- a/tp/Texinfo/XS/main/translations.c
+++ b/tp/Texinfo/XS/main/translations.c
@@ -32,7 +32,7 @@
 #include "text.h"
 #include "command_ids.h"
 #include "tree_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "types_data.h"
 #include "tree.h"
 #include "utils.h"
diff --git a/tp/Texinfo/XS/main/translations.h 
b/tp/Texinfo/XS/main/translations.h
index f5a76b3d86..bd29e9ae82 100644
--- a/tp/Texinfo/XS/main/translations.h
+++ b/tp/Texinfo/XS/main/translations.h
@@ -4,7 +4,7 @@
 
 #include <stddef.h>
 
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index c89eb12a3a..5240d57179 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -44,7 +44,7 @@
 #include "tree_types.h"
 #include "global_commands_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 /* for CL_* */
 #include "document_types.h"
 #include "converter_types.h"
diff --git a/tp/Texinfo/XS/main/utils.h b/tp/Texinfo/XS/main/utils.h
index f42b882130..5ad606185f 100644
--- a/tp/Texinfo/XS/main/utils.h
+++ b/tp/Texinfo/XS/main/utils.h
@@ -26,7 +26,7 @@
 #include "tree_types.h"
 #include "global_commands_types.h"
 #include "option_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "converter_types.h"
 
diff --git a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs 
b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
index e537a45a77..8e458f7fd2 100644
--- a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
+++ b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
@@ -29,7 +29,7 @@
 
 #undef context
 
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 #include "tree.h"
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c 
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index 7fe174097d..ad848e7753 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -25,7 +25,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "global_commands_types.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "document_types.h"
 #include "tree.h"
 #include "extra.h"
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.h 
b/tp/Texinfo/XS/structuring_transfo/structuring.h
index 9b1d50f4d5..4738bdc601 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.h
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.h
@@ -3,7 +3,7 @@
 #define STRUCTURING_H
 
 #include "command_ids.h"
-#include "options_types.h"
+#include "options_data.h"
 #include "tree_types.h"
 #include "document_types.h"
 
diff --git a/tp/maintain/regenerate_C_options_info.pl 
b/tp/maintain/regenerate_C_options_info.pl
index afce76ddbe..4872bf1c3c 100755
--- a/tp/maintain/regenerate_C_options_info.pl
+++ b/tp/maintain/regenerate_C_options_info.pl
@@ -158,7 +158,7 @@ open(HEADER, '>', $header_file)
       or die "Open $header_file: $!\n";
 print HEADER "/* Automatically generated from $program_name */\n\n";
 
-print HEADER "#ifndef OPTIONS_TYPES_H\n#define OPTIONS_TYPES_H\n\n";
+print HEADER "#ifndef OPTIONS_DATA_H\n#define OPTIONS_DATA_H\n\n";
 
 print HEADER "#include \"option_types.h\"\n\n";
 
@@ -199,7 +199,7 @@ print CODE '#include <stdlib.h>'."\n";
 print CODE '#include <string.h>'."\n\n";
 
 print CODE '#include "option_types.h"'."\n";
-print CODE '#include "options_types.h"'."\n";
+print CODE '#include "options_data.h"'."\n";
 print CODE '#include "converter_types.h"'."\n";
 print CODE '/* for COMMAND_OPTION_DEFAULT */'."\n";
 print CODE '#include "utils.h"'."\n";
@@ -350,7 +350,7 @@ print ODCF "/* Automatically generated from $program_name 
*/\n\n";
 print ODCF '#include <config.h>'."\n\n";
 
 print ODCF '#include "option_types.h"'."\n";
-print ODCF '#include "options_types.h"'."\n";
+print ODCF '#include "options_data.h"'."\n";
 print ODCF '#include "customization_options.h"'."\n";
 print ODCF '#include "options_defaults.h"'."\n\n";
 
@@ -362,7 +362,7 @@ print ODHF "#ifndef OPTIONS_DEFAULTS_H\n#define 
OPTIONS_DEFAULTS_H\n\n";
 print ODHF "/* Automatically generated from $program_name */\n\n";
 
 print ODHF "#include \"main/option_types.h\"\n";
-print ODHF "#include \"main/options_types.h\"\n\n";
+print ODHF "#include \"main/options_data.h\"\n\n";
 
 print ODHF "/* Undefine values set from autoconf as we use these as\n";
 print ODHF "   customization variable names.  The original values are\n";
@@ -444,7 +444,7 @@ print CDCF "/* Automatically generated from $program_name 
*/\n\n";
 print CDCF '#include <config.h>'."\n\n";
 
 print CDCF '#include "option_types.h"'."\n";
-print CDCF '#include "options_types.h"'."\n";
+print CDCF '#include "options_data.h"'."\n";
 print CDCF '#include "converters_options.h"'."\n\n";
 print CDCF '/* for html_fill_button_directions_specification_list */'."\n";
 print CDCF '#include "utils.h"'."\n";
@@ -460,7 +460,7 @@ print CDHF "#ifndef CONVERTERS_DEFAULTS_H\n#define 
CONVERTERS_DEFAULTS_H\n\n";
 print CDHF "/* Automatically generated from $program_name */\n\n";
 
 print CDHF "#include \"main/option_types.h\"\n";
-print CDHF "#include \"main/options_types.h\"\n\n";
+print CDHF "#include \"main/options_data.h\"\n\n";
 
 print CDHF "/* Undefine values set from autoconf as we use these as\n";
 print CDHF "   customization variable names.  The original values are\n";
@@ -530,7 +530,7 @@ close(CDHF);
 open(GET, ">$get_file") or die "Open $get_file: $!\n";
 print GET "/* Automatically generated from $program_name */\n\n";
 
-print GET '#include "options_types.h"'."\n";
+print GET '#include "options_data.h"'."\n";
 print GET '#include "converter_types.h"'."\n";
 print GET '#include "get_perl_info.h"'."\n\n";
 



reply via email to

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