diff options
| author | Max <msuraev@sysmocom.de> | 2018-01-30 13:29:38 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-27 22:27:53 +0100 |
| commit | 6d026d26cd54a3a0096fd95fbafa1c7411a5aa0f (patch) | |
| tree | 870e965d676132dd8d9e8eb48f1b805035d4f78d | |
| parent | 5e5c482da25371f97b6fa1113d25405345fb3c68 (diff) | |
Move include guard to the top
Having explicit include above the douible-include guard defines is
potential source for hard to track bugs. Let's move it inside the guard
statement.
Change-Id: I5114a63ce00b03c8eed23565d52969250bd505cc
Related: OS#1539
| -rw-r--r-- | src/csn1.h | 6 | ||||
| -rw-r--r-- | src/gsm_rlcmac.h | 5 |
2 files changed, 6 insertions, 5 deletions
@@ -25,15 +25,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _PACKET_CSN1_H_ +#define _PACKET_CSN1_H_ + extern "C" { #include <osmocom/core/bitvec.h> } #include <iostream> #include <cstdlib> -#ifndef _PACKET_CSN1_H_ -#define _PACKET_CSN1_H_ - #define MIN(a,b) (((a)<(b))?(a):(b)) //#define max(a,b) (((a)>(b))?(a):(b)) diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 8f4039c5..2ad19370 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -29,11 +29,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __PACKET_GSM_RLCMAC_H__ +#define __PACKET_GSM_RLCMAC_H__ + #include "csn1.h" #include <iostream> #include <cstdlib> -#ifndef __PACKET_GSM_RLCMAC_H__ -#define __PACKET_GSM_RLCMAC_H__ #ifndef PRE_PACKED #define PRE_PACKED |