Merge pull request #29 from Y-Less/master

Check imcompatible include combinations.
pawn-lang · Mar 27, 2020 · fca1489 · fca1489
2 parents 47ebdc5 + d224a1f
commit fca1489
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/a_npc.inc b/a_npc.inc
@@ -7,6 +7,9 @@
 #if defined _INC_a_npc
 	#endinput
 #endif
+#if defined _INC_a_samp
+	#error Include `<a_samp>` or `<a_npc>`, not both.
+#endif
 #define _INC_a_npc
 #define _samp_included
 
@@ -236,6 +239,8 @@ open.mp releases can use `A` as the first digit.
 // Util
 
 #if !defined _console_included
+	#define _console_included
+
 	/// <summary>Prints a string to the server console (not in-game chat) and logs (server_log.txt).</summary>
 	/// <param name="string">The string to print</param>
 	/// <seealso name="printf"/>

diff --git a/a_samp.inc b/a_samp.inc
@@ -7,6 +7,9 @@
 #if defined _INC_a_samp
 	#endinput
 #endif
+#if defined _INC_a_npc
+	#error Include `<a_samp>` or `<a_npc>`, not both.
+#endif
 #define _INC_a_samp
 #define _samp_included
 
@@ -333,6 +336,8 @@ open.mp releases can use `A` as the first digit.
 // Util
 
 #if !defined _console_included
+	#define _console_included
+
 	/// <summary>Prints a string to the server console (not in-game chat) and logs (server_log.txt).</summary>
 	/// <param name="string">The string to print</param>
 	/// <seealso name="printf"/>