///\r
/// NULL pointer (VOID *)\r
///\r
+#if defined (__cplusplus)\r
+ #if defined (_MSC_EXTENSIONS)\r
+#define NULL nullptr\r
+ #else\r
+#define NULL __null\r
+ #endif\r
+#else\r
#define NULL ((VOID *) 0)\r
+#endif\r
\r
//\r
// Null character\r
**/\r
#ifdef MDE_CPU_EBC\r
#define STATIC_ASSERT(Expression, Message)\r
-#elif defined (_MSC_EXTENSIONS)\r
+#elif defined (_MSC_EXTENSIONS) || defined (__cplusplus)\r
#define STATIC_ASSERT static_assert\r
#else\r
#define STATIC_ASSERT _Static_assert\r
///\r
/// The operation completed successfully.\r
///\r
-#define RETURN_SUCCESS 0\r
+#define RETURN_SUCCESS (RETURN_STATUS)(0)\r
\r
///\r
/// The image failed to load.\r