Fix build issues.

Author: jonsimantov

analytics/generate_windows_stubs.py

@@ -159,6 +159,7 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
         f.write(f"// Generated from {os.path.basename(header_file_path)} by {os.path.basename(sys.argv[0])}\n\n")
         f.write(f"#ifndef {header_guard}\n")
         f.write(f"#define {header_guard}\n\n")
+        f.write(f"#define ANALYTICS_API  // filter out from header copy\n\n")
         f.write("#include <stdbool.h>  // needed for bool type in pure C\n\n")
 
         f.write("// --- Copied from original header ---\n")

analytics/src/analytics_desktop.cc

@@ -28,9 +28,7 @@
 
 #if defined(_WIN32)
 #include <windows.h>
-
-// analytics_windows.h is not strictly needed if only using C API via
-// analytics_desktop_dynamic.h #include "analytics/src/analytics_windows.h"
+#include "analytics_windows.h"
 #endif  // defined(_WIN32)
 
 namespace firebase {

analytics/src/analytics_desktop_dynamic.c

@@ -18,8 +18,7 @@
 
 #include <stddef.h>
 
-// A nice big chunk of stub memory that can be returned by stubbed Create
-// methods.
+// A nice big chunk of stub memory that can be returned by stubbed Create methods.
 static char g_stub_memory[256] = {0};
 
 // clang-format off

analytics/src/analytics_desktop_dynamic.h

@@ -17,6 +17,8 @@
 #ifndef FIREBASE_ANALYTICS_SRC_WINDOWS_ANALYTICS_DESKTOP_DYNAMIC_H_
 #define FIREBASE_ANALYTICS_SRC_WINDOWS_ANALYTICS_DESKTOP_DYNAMIC_H_
 
+#define ANALYTICS_API  // filter out from header copy
+
 #include <stdbool.h>  // needed for bool type in pure C
 
 // --- Copied from original header ---