diff options
| author | gbian <gbian@codeaurora.org> | 2016-12-16 13:16:19 +0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-12-29 13:23:32 -0800 |
| commit | 067435f387f812b1456890b09375dbc915ecf3dd (patch) | |
| tree | 5ab1983dff64d1c5a6db453a06266d215938c8ba | |
| parent | 855d079c2b0630ca1581cf003fd72e5d1a5c6099 (diff) | |
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
| -rw-r--r-- | core/sap/dfs/src/dfs_phyerr_tlv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.h b/core/sap/dfs/src/dfs_phyerr_tlv.h index 61da81c3ad09..aa3383302e22 100644 --- a/core/sap/dfs/src/dfs_phyerr_tlv.h +++ b/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-2016 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) |