From cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Wed, 27 Mar 2019 15:32:05 -0700 Subject: Moved macros from upb.h to port_def.inc to avoid leaking them to users. (#160) * Use port_def.inc to prevent macros from leaking to users. * Added helpful comments to port_def.inc/port_undef.inc. --- tools/amalgamate.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/amalgamate.py b/tools/amalgamate.py index 374d126..ed5f665 100755 --- a/tools/amalgamate.py +++ b/tools/amalgamate.py @@ -52,10 +52,7 @@ output_path = sys.argv[2] amalgamator = Amalgamator(include_path, output_path) for filename in sys.argv[3:]: - # Leave JIT out of the amalgamation. - if "x64" in filename or "dynasm" in filename: - continue - - amalgamator.add_src(filename.strip()) + if filename.endswith(".h") or filename.endswith(".inc"): + amalgamator.add_src(filename.strip()) amalgamator.finish() -- cgit v1.2.3