diff options
| author | Karl Schultz <karl@lunarg.com> | 2016-05-10 11:36:08 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2016-05-10 11:36:08 -0600 |
| commit | c8e30e3fc55e668c91164f75b37a492162d8bf15 (patch) | |
| tree | 588c519584e35fba532050b4834c7aa20b78fde0 | |
| parent | 4d48f512830f548ff5e81a20948d4bcdf698308f (diff) | |
| download | usermoji-c8e30e3fc55e668c91164f75b37a492162d8bf15.tar.xz | |
build: GH316 include cinttypes instead of inttypes.h
Fixes compilation problems on CentOS.
Change-Id: I92c5ea0ebea8684c40e67e9b386732e55cb47cc8
| -rw-r--r-- | layers/image.cpp | 2 | ||||
| -rw-r--r-- | layers/unique_objects.h | 2 | ||||
| -rw-r--r-- | layers/vk_layer_logging.h | 2 | ||||
| -rwxr-xr-x | vk-layer-generate.py | 2 | ||||
| -rwxr-xr-x | vk_helper.py | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/layers/image.cpp b/layers/image.cpp index fde2ac81..398283be 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -26,7 +26,7 @@ #include <algorithm> #include <assert.h> -#include <inttypes.h> +#include <cinttypes> #include <memory> #include <mutex> #include <stdio.h> diff --git a/layers/unique_objects.h b/layers/unique_objects.h index e32970da..6c2c2e3c 100644 --- a/layers/unique_objects.h +++ b/layers/unique_objects.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <inttypes.h> +#include <cinttypes> #include <unordered_map> #include <vector> diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h index bbd24d0f..1d01413e 100644 --- a/layers/vk_layer_logging.h +++ b/layers/vk_layer_logging.h @@ -27,7 +27,7 @@ #include "vk_layer_table.h" #include "vk_loader_platform.h" #include "vulkan/vk_layer.h" -#include <inttypes.h> +#include <cinttypes> #include <stdarg.h> #include <stdbool.h> #include <stdio.h> diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 1705d73b..66e00170 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -715,7 +715,7 @@ class ObjectTrackerSubcommand(Subcommand): header_txt.append('#include <stdio.h>') header_txt.append('#include <stdlib.h>') header_txt.append('#include <string.h>') - header_txt.append('#include <inttypes.h>') + header_txt.append('#include <cinttypes>') header_txt.append('') header_txt.append('#include <unordered_map>') header_txt.append('') diff --git a/vk_helper.py b/vk_helper.py index 62c1d1ab..721b1a05 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -2158,7 +2158,7 @@ def main(argv=None): if opts.gen_struct_wrappers: sw = StructWrapperGen(struct_dict, os.path.basename(opts.input_file).strip(".h"), os.path.dirname(enum_sh_filename)) #print(sw.get_class_name(struct)) - sw.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","inttypes.h", "stdio.h","stdlib.h"]) + sw.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","cinttypes", "stdio.h","stdlib.h"]) print("Generating struct wrapper header to %s" % sw.header_filename) sw.generateHeader() print("Generating struct wrapper class to %s" % sw.class_filename) @@ -2189,7 +2189,7 @@ def main(argv=None): cmg.generate() if opts.gen_graphviz: gv = GraphVizGen(struct_dict, os.path.basename(opts.input_file).strip(".h"), os.path.dirname(enum_sh_filename)) - gv.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h", "inttypes.h"]) + gv.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h", "cinttypes"]) gv.generate() print("DONE!") #print(typedef_rev_dict) |