Minor types cleanup for API gen (see #3836)

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;
 

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_