Skip to content

Commit fca1489

Browse files
authored
Merge pull request #29 from Y-Less/master
Check imcompatible include combinations.
2 parents 47ebdc5 + d224a1f commit fca1489

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

a_npc.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#if defined _INC_a_npc
88
#endinput
99
#endif
10+
#if defined _INC_a_samp
11+
#error Include `<a_samp>` or `<a_npc>`, not both.
12+
#endif
1013
#define _INC_a_npc
1114
#define _samp_included
1215

@@ -236,6 +239,8 @@ open.mp releases can use `A` as the first digit.
236239
// Util
237240

238241
#if !defined _console_included
242+
#define _console_included
243+
239244
/// <summary>Prints a string to the server console (not in-game chat) and logs (server_log.txt).</summary>
240245
/// <param name="string">The string to print</param>
241246
/// <seealso name="printf"/>

a_samp.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#if defined _INC_a_samp
88
#endinput
99
#endif
10+
#if defined _INC_a_npc
11+
#error Include `<a_samp>` or `<a_npc>`, not both.
12+
#endif
1013
#define _INC_a_samp
1114
#define _samp_included
1215

@@ -333,6 +336,8 @@ open.mp releases can use `A` as the first digit.
333336
// Util
334337

335338
#if !defined _console_included
339+
#define _console_included
340+
336341
/// <summary>Prints a string to the server console (not in-game chat) and logs (server_log.txt).</summary>
337342
/// <param name="string">The string to print</param>
338343
/// <seealso name="printf"/>

0 commit comments

Comments
 (0)