Merge branch 'master' into master

google · Aug 20, 2024 · b4d0ce9 · b4d0ce9
2 parents 2a89df9 + baddf90
commit b4d0ce9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -33,6 +33,7 @@ platforms:
   macos:
     xcode_version: "14.3"
     build_targets:
-    - "//..."
+    - "//:flatbuffers"
+    - "//:flatc"
     test_targets:
-    - "//..."
+    - "//tests:flatbuffers_test"
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
@@ -339,8 +339,8 @@ typedef uint16_t voffset_t;
 typedef uintmax_t largest_scalar_t;
 
 // In 32bits, this evaluates to 2GB - 1
-#define FLATBUFFERS_MAX_BUFFER_SIZE std::numeric_limits<::flatbuffers::soffset_t>::max()
-#define FLATBUFFERS_MAX_64_BUFFER_SIZE std::numeric_limits<::flatbuffers::soffset64_t>::max()
+#define FLATBUFFERS_MAX_BUFFER_SIZE (std::numeric_limits<::flatbuffers::soffset_t>::max)()
+#define FLATBUFFERS_MAX_64_BUFFER_SIZE (std::numeric_limits<::flatbuffers::soffset64_t>::max)()
 
 // The minimum size buffer that can be a valid flatbuffer.
 // Includes the offset to the root table (uoffset_t), the offset to the vtable

diff --git a/python/setup.cfg b/python/setup.cfg
@@ -3,4 +3,4 @@ universal=1
 
 [metadata]
 license_files =
-   ../license
+   ../LICENSE
diff --git a/python/setup.py b/python/setup.py
@@ -18,7 +18,6 @@
     name='flatbuffers',
     version='24.3.25',
     license='Apache 2.0',
-    license_files='../LICENSE',
     author='Derek Bailey',
     author_email='[email protected]',
     url='https://google.github.io/flatbuffers/',