From c8be96d15c74c61edbf11e96ea38cd2382c0dfc7 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 17 Feb 2025 11:57:49 -0500
Subject: [PATCH] Minor types cleanup for API gen (see #3836)

---
 cef_api_versions.json            | 50 ++++++++++++++++----------------
 include/internal/cef_types.h     |  2 ++
 include/internal/cef_types_osr.h | 11 +++++++
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/cef_api_versions.json b/cef_api_versions.json
index aded39881..77834d8bd 100644
--- a/cef_api_versions.json
+++ b/cef_api_versions.json
@@ -1,39 +1,39 @@
 {
   "hashes": {
     "13300": {
-      "comment": "Added January 13, 2025.",
-      "linux": "b622b5e8d42567bd96b6c530c3bf39b42d94c97a",
-      "mac": "10daecda70220382f54f8b1fc3b2d1df7da3088c",
-      "universal": "a5c9449c676e3d151ac2d141bd3907dcd1fec3d4",
-      "windows": "854c5a8fc37bb040ad0ad8e4680f62b07ec217c0"
+      "comment": "Added February 17, 2025.",
+      "linux": "87d31692cf1ff1f0f2445dd026dcc0aeb02c5786",
+      "mac": "3891d2358697f15e046afc65fefd7019d888817a",
+      "universal": "c1a7d47be6fc130795366a1627573aa8eba1106f",
+      "windows": "0efb201c9e981c4513aeea04f9f2f8041ee9ce1f"
     },
     "13301": {
-      "comment": "Added January 13, 2025.",
-      "linux": "0ec77d8bc98964aaf2c4ac037dbbe47f59863902",
-      "mac": "65b51b1dfde1ab0af99d98e1e8b6aadf5bc28707",
-      "universal": "e343550e4371b76f59813dac2742a9d3206cb98f",
-      "windows": "34b14819172ed39721a3fe298cf73dec7b6e7df2"
+      "comment": "Added February 17, 2025.",
+      "linux": "747f624e5059839e6a7d385de7997d45bbd42184",
+      "mac": "d3ec7d79adbde067590ab1bfff1f30dd8b06546a",
+      "universal": "892e654249acc7360f8aca4ee77da896753b87b8",
+      "windows": "cf9fbb7aa6778fedce78b8557044f219f2b5ba0b"
     },
     "13302": {
-      "comment": "Added January 13, 2025.",
-      "linux": "e98affe8187daaa1ee02b01677208ff0a54af74c",
-      "mac": "45a0649980f85c53a6156627f0af6368ccfc5554",
-      "universal": "b8423655541f6f2a1a9b6f5252f03e59842dc31a",
-      "windows": "b04c40f0d79e2ea6f6a4d508843b9eaafb102c1e"
+      "comment": "Added February 17, 2025.",
+      "linux": "ae4ab1c52ad951d37e6397db9f4e0ab0ce5044cf",
+      "mac": "cfe09351db37aa275613c27145fe622d9c28d4cc",
+      "universal": "acab8df1244923f1f80b18214e73c276a553ded6",
+      "windows": "c4b5a65478bc1a679f4a47ba5ff6899e5c3d8761"
     },
     "13303": {
-      "comment": "Added January 13, 2025.",
-      "linux": "1b2584e9f06dc0cb59ccceee89857fc164d4db52",
-      "mac": "82d74e5024ed80b43d49d7e83b0e8a3a42a0b319",
-      "universal": "a0905ba86f2c4964857f6c9c0706ab3e1050a8cd",
-      "windows": "bc115a66808672931cf676ce31d58ded946f680e"
+      "comment": "Added February 17, 2025.",
+      "linux": "2683698b779f11bba19f4051e3760fe327a1c8b2",
+      "mac": "8085a0f62f15946343c63788300e5c2b422b3301",
+      "universal": "128210b71e3f621cb6d2c4b05c6d0408a4547f2f",
+      "windows": "5a22d42c3e6294eb4ee2424053eebdeae3027899"
     },
     "13304": {
-      "comment": "Added January 13, 2025.",
-      "linux": "199fe896c737a07dcf1506e0c86688363df7e8b6",
-      "mac": "405810f1f8b146678867b6a91cbe8c4670febbbf",
-      "universal": "be55f7cf1813ae098d4f68b2a2c9ca85784fc3ee",
-      "windows": "73bb28a92f4be742e3fc80057a80797e3bf23063"
+      "comment": "Added February 17, 2025.",
+      "linux": "c709233cd071e0d715eb10ceec4c5aea805df997",
+      "mac": "32af7e8f8828b04cf2908de9857940faa54deb8a",
+      "universal": "131b720865dd5c54c72041c0fbfb7c9bbfee8e0b",
+      "windows": "979b48138012378192dac7ee972fa731e9c0dae9"
     }
   },
   "last": "13304",
diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h
index e46eddb81..72a2e5f72 100644
--- a/include/internal/cef_types.h
+++ b/include/internal/cef_types.h
@@ -993,9 +993,11 @@ typedef enum {
   // No error.
   ERR_NONE = 0,
 
+#if !defined(GENERATING_CEF_API_HASH)
 #define NET_ERROR(label, value) ERR_##label = value,
 #include "include/base/internal/cef_net_error_list.h"
 #undef NET_ERROR
+#endif
 
 } cef_errorcode_t;
 
diff --git a/include/internal/cef_types_osr.h b/include/internal/cef_types_osr.h
index d355e16e7..4ad1d46c3 100644
--- a/include/internal/cef_types_osr.h
+++ b/include/internal/cef_types_osr.h
@@ -31,8 +31,15 @@
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_OSR_H_
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "include/internal/cef_types_geometry.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ///
 /// Structure containing shared texture common metadata.
 /// For documentation on each field, please refer to
@@ -107,4 +114,8 @@ typedef struct _cef_accelerated_paint_info_common_t {
 
 } cef_accelerated_paint_info_common_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_OSR_H_