diff options
| author | Jack Lloyd <[email protected]> | 2017-09-20 02:53:08 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-20 02:53:08 -0400 |
| commit | 8731d4920fa8b17374a442d62c2d8c1c6d34967a (patch) | |
| tree | 0a0e98cf0c50e502397d920d8d4aa66f0036ce90 /configure.py | |
| parent | f7927e4081f1029e0b9c735cfff12ab1fc5f05b8 (diff) | |
Change header guard format to BOTAN_FOO_H_
ISO C++ reserves names with double underscores in them
Closes #512
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 0f803c601..8a6eb2ddd 100755 --- a/configure.py +++ b/configure.py @@ -2554,7 +2554,7 @@ class AmalgamationHeader(object): class AmalgamationGenerator(object): filename_prefix = 'botan_all' - _header_guard_pattern = re.compile('^#define BOTAN_.*_H__$') + _header_guard_pattern = re.compile('^#define BOTAN_.*_H_$') @staticmethod def strip_header_goop(header_name, header_lines): @@ -2621,12 +2621,12 @@ class AmalgamationGenerator(object): pub_header_amalag = AmalgamationHeader(self._build_paths.public_headers) header_name = '%s.h' % (AmalgamationGenerator.filename_prefix) logging.info('Writing amalgamation header to %s' % (header_name)) - pub_header_amalag.write_to_file(header_name, "BOTAN_AMALGAMATION_H__") + pub_header_amalag.write_to_file(header_name, "BOTAN_AMALGAMATION_H_") internal_headers = AmalgamationHeader(self._build_paths.internal_headers) header_int_name = '%s_internal.h' % (AmalgamationGenerator.filename_prefix) logging.info('Writing amalgamation header to %s' % (header_int_name)) - internal_headers.write_to_file(header_int_name, "BOTAN_AMALGAMATION_INTERNAL_H__") + internal_headers.write_to_file(header_int_name, "BOTAN_AMALGAMATION_INTERNAL_H_") header_files = [header_name, header_int_name] included_in_headers = pub_header_amalag.all_std_includes | internal_headers.all_std_includes |