From c629c0b7e257e179482e5d8cfcc7b482568602ae Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Wed, 28 Aug 2024 01:09:45 -0700
Subject: [PATCH] fix: CDV.h wasn't bringing in Cordova.h consistently

The fact that there's a circular dependency between the headers isn't
actually a problem in Objective-C because it uses `#import` rather than
`#include` and the compiler ensures each header is only included once.

Somehow that was also causing it to only evaluate the header once and
not differentiate imports where the macro was defined vs not defined.
---
 CordovaLib/include/Cordova/CDV.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CordovaLib/include/Cordova/CDV.h b/CordovaLib/include/Cordova/CDV.h
index ee41aff8f..24ed1e5e8 100644
--- a/CordovaLib/include/Cordova/CDV.h
+++ b/CordovaLib/include/Cordova/CDV.h
@@ -19,5 +19,6 @@
 
 #ifndef __CORDOVA_SILENCE_HEADER_DEPRECATIONS
     #warning Import <Cordova/Cordova.h> rather than <Cordova/CDV.h>
-    #import <Cordova/Cordova.h>
 #endif
+
+#import <Cordova/Cordova.h>