BaseTools: Fix compile error on VS2010

[edk2] [Patch] BaseTools: Fix compile error on VS2010

Posted by Yonghong Zhu 6 years, 11 months ago

VS2010 also defined RSIZE_MAX, so we undef it first.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/C/Common/CommonLib.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
index 9da16e8..dccb192 100644
--- a/BaseTools/Source/C/Common/CommonLib.h
+++ b/BaseTools/Source/C/Common/CommonLib.h
@@ -1,9 +1,9 @@
 /** @file
 Common library assistance routines.
 
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
 
@@ -26,13 +26,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL)
 #define MAX_UINT16  ((UINT16)0xFFFF)
 #define MAX_UINT8   ((UINT8)0xFF)
 #define ARRAY_SIZE(Array) (sizeof (Array) / sizeof ((Array)[0]))
 #define ASCII_RSIZE_MAX 1000000
-#ifndef RSIZE_MAX
+#undef RSIZE_MAX
 #define RSIZE_MAX 1000000
-#endif
 
 #define IS_COMMA(a)                ((a) == L',')
 #define IS_HYPHEN(a)               ((a) == L'-')
 #define IS_DOT(a)                  ((a) == L'.')
 #define IS_LEFT_PARENTH(a)         ((a) == L'(')
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Fix compile error on VS2010

Posted by Gao, Liming 6 years, 11 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Wednesday, January 03, 2018 1:48 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix compile error on VS2010
>
>VS2010 also defined RSIZE_MAX, so we undef it first.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/C/Common/CommonLib.h | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/BaseTools/Source/C/Common/CommonLib.h
>b/BaseTools/Source/C/Common/CommonLib.h
>index 9da16e8..dccb192 100644
>--- a/BaseTools/Source/C/Common/CommonLib.h
>+++ b/BaseTools/Source/C/Common/CommonLib.h
>@@ -1,9 +1,9 @@
> /** @file
> Common library assistance routines.
>
>-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
>+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
>License
> which accompanies this distribution.  The full text of the license may be found
>at
> http://opensource.org/licenses/bsd-license.php
>
>@@ -26,13 +26,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
>KIND, EITHER EXPRESS OR IMPLIED.
> #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL)
> #define MAX_UINT16  ((UINT16)0xFFFF)
> #define MAX_UINT8   ((UINT8)0xFF)
> #define ARRAY_SIZE(Array) (sizeof (Array) / sizeof ((Array)[0]))
> #define ASCII_RSIZE_MAX 1000000
>-#ifndef RSIZE_MAX
>+#undef RSIZE_MAX
> #define RSIZE_MAX 1000000
>-#endif
>
> #define IS_COMMA(a)                ((a) == L',')
> #define IS_HYPHEN(a)               ((a) == L'-')
> #define IS_DOT(a)                  ((a) == L'.')
> #define IS_LEFT_PARENTH(a)         ((a) == L'(')
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel