-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ACPICA: MSVC: Fix inclusion order issue of <crtdbg.h>
ACPICA commit 49c6a6517a906900e9baa51ad5859beeb8a3089f The following error logs can be seen for calloc/free/malloc/realloc that defined in the stdlib.h: ...\stdlib.h(281) : error C2059: syntax error : ',' ...\stdlib.h(281) : error C2143: syntax error : missing ')' before 'constant' ...\stdlib.h(281) : error C2143: syntax error : missing '{' before 'constant' ...\stdlib.h(281) : error C2059: syntax error : '<Unknown>' ...\stdlib.h(281) : error C2059: syntax error : ')' This is caused by the wrong inclusion order of stdlib.h/crtdbg.h introduced in acenv.h. This patch fixes this breakage. Lv Zheng. This patch doesn't affect Linux kernel. Link: https://github.com/acpica/acpica/commit/49c6a651 Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- Loading branch information
Lv Zheng
authored and
Rafael J. Wysocki
committed
Jul 23, 2015
1 parent
53d9edc
commit 5a4f069
Showing
3 changed files
with
106 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/****************************************************************************** | ||
* | ||
* Name: acmsvcex.h - Extra VC specific defines, etc. | ||
* | ||
*****************************************************************************/ | ||
|
||
/* | ||
* Copyright (C) 2000 - 2015, Intel Corp. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions, and the following disclaimer, | ||
* without modification. | ||
* 2. Redistributions in binary form must reproduce at minimum a disclaimer | ||
* substantially similar to the "NO WARRANTY" disclaimer below | ||
* ("Disclaimer") and any redistribution must be conditioned upon | ||
* including a substantially similar Disclaimer requirement for further | ||
* binary redistribution. | ||
* 3. Neither the names of the above-listed copyright holders nor the names | ||
* of any contributors may be used to endorse or promote products derived | ||
* from this software without specific prior written permission. | ||
* | ||
* Alternatively, this software may be distributed under the terms of the | ||
* GNU General Public License ("GPL") version 2 as published by the Free | ||
* Software Foundation. | ||
* | ||
* NO WARRANTY | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | ||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGES. | ||
*/ | ||
|
||
#ifndef __ACMSVCEX_H__ | ||
#define __ACMSVCEX_H__ | ||
|
||
/* Debug support. */ | ||
|
||
#ifdef _DEBUG | ||
#define _CRTDBG_MAP_ALLOC /* Enables specific file/lineno for leaks */ | ||
#include <crtdbg.h> | ||
#endif | ||
|
||
#endif /* __ACMSVCEX_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/****************************************************************************** | ||
* | ||
* Name: acwinex.h - Extra OS specific defines, etc. | ||
* | ||
*****************************************************************************/ | ||
|
||
/* | ||
* Copyright (C) 2000 - 2015, Intel Corp. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions, and the following disclaimer, | ||
* without modification. | ||
* 2. Redistributions in binary form must reproduce at minimum a disclaimer | ||
* substantially similar to the "NO WARRANTY" disclaimer below | ||
* ("Disclaimer") and any redistribution must be conditioned upon | ||
* including a substantially similar Disclaimer requirement for further | ||
* binary redistribution. | ||
* 3. Neither the names of the above-listed copyright holders nor the names | ||
* of any contributors may be used to endorse or promote products derived | ||
* from this software without specific prior written permission. | ||
* | ||
* Alternatively, this software may be distributed under the terms of the | ||
* GNU General Public License ("GPL") version 2 as published by the Free | ||
* Software Foundation. | ||
* | ||
* NO WARRANTY | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | ||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGES. | ||
*/ | ||
|
||
#ifndef __ACWINEX_H__ | ||
#define __ACWINEX_H__ | ||
|
||
/* Windows uses VC */ | ||
|
||
#endif /* __ACWINEX_H__ */ |