8324682: Remove redefinition of NULL for XLC compiler
Reviewed-by: kbarrett, mbaesken
This commit is contained in:
parent
8a3bdd5c4d
commit
313e814bc9
src/hotspot/share/utilities
@ -157,7 +157,6 @@ void basic_types_init() {
|
||||
static_assert(is_power_of_2(HeapWordSize), "HeapWordSize must be power of 2");
|
||||
static_assert((size_t)HeapWordSize >= sizeof(juint),
|
||||
"HeapWord should be at least as large as juint");
|
||||
static_assert(sizeof(NULL) == sizeof(char*), "NULL must be same size as pointer");
|
||||
#endif
|
||||
|
||||
if( JavaPriority1_To_OSPriority != -1 )
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@ -93,22 +93,8 @@
|
||||
|
||||
// NULL vs NULL_WORD:
|
||||
// Some platform/tool-chain combinations can't assign NULL to an integer
|
||||
// type so we define NULL_WORD to use in those contexts. For xlc they are the same.
|
||||
#define NULL_WORD NULL
|
||||
|
||||
// AIX also needs a 64 bit NULL to work as a null address pointer.
|
||||
// Most system includes on AIX would define it as an int 0 if not already defined with one
|
||||
// exception: /usr/include/dirent.h will unconditionally redefine NULL to int 0 again.
|
||||
// In this case you need to copy the following defines to a position after #include <dirent.h>
|
||||
#include <dirent.h>
|
||||
#ifdef _LP64
|
||||
#undef NULL
|
||||
#define NULL 0L
|
||||
#else
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
#endif
|
||||
#endif
|
||||
// type so we define NULL_WORD to use in those contexts.
|
||||
#define NULL_WORD 0L
|
||||
|
||||
// checking for nanness
|
||||
inline int g_isnan(float f) { return isnan(f); }
|
||||
|
Loading…
x
Reference in New Issue
Block a user