Forráskód Böngészése

qcacld-3.0: Fix the compiling error for macros SM/MS redefinition

Fix the compiling error for macors SM/MS redefinition in both htc.h
and dfs_phyerr_tlv.h.

Change-Id: I591bc8a55542ff8f3b6ce27201c33164e4bdfb66
CRs-Fixed: 1102190
gbian 8 éve
szülő
commit
32b067081b
1 módosított fájl, 3 hozzáadás és 1 törlés
  1. 3 1
      core/sap/dfs/src/dfs_phyerr_tlv.h

+ 3 - 1
core/sap/dfs/src/dfs_phyerr_tlv.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015,2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -47,6 +47,8 @@
  * to follow the convention that an _S suffix is appended for
  * a shift count, while the field mask has no suffix.
  */
+#undef SM
+#undef MS
 #define SM(_v, _f)      (((_v) << _f ## _S) & _f)
 #define MS(_v, _f)      (((_v) & _f) >> _f ## _S)