summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Weinfurt <tweinfurt@yahoo.com>2017-10-06 13:30:24 -0700
committerJan Vorlicek <janvorli@microsoft.com>2017-10-06 22:30:24 +0200
commitd379aa3040c9c55bf596709c5858cfc81b9762b6 (patch)
tree838380e80fe486f987940f7aa53fa4ab7c676791
parent6aa119dcdb88ba1157191600a992aa94eee59b22 (diff)
downloadcoreclr-d379aa3040c9c55bf596709c5858cfc81b9762b6.tar.gz
coreclr-d379aa3040c9c55bf596709c5858cfc81b9762b6.tar.bz2
coreclr-d379aa3040c9c55bf596709c5858cfc81b9762b6.zip
undef NULL to fix compilation problems on FreeBSD after 08d39dd. (#14341)
* undef NULL to fix compilation problems on FreeBSD after 08d39dd. * remove unneccesary #ifndef NULL
-rw-r--r--src/pal/inc/pal.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
index 1a1b6c8625..8f6bc12798 100644
--- a/src/pal/inc/pal.h
+++ b/src/pal/inc/pal.h
@@ -277,17 +277,13 @@ PAL_IsDebuggerPresent(VOID);
#define _UI32_MAX UINT_MAX
#define _UI32_MIN UINT_MIN
-#ifdef PAL_STDCPP_COMPAT
#undef NULL
-#endif
-#ifndef NULL
#if defined(__cplusplus)
#define NULL 0
#else
#define NULL ((void *)0)
#endif
-#endif
#if defined(PAL_STDCPP_COMPAT) && !defined(__cplusplus)
#define nullptr NULL