diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-24 22:19:46 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-24 22:19:46 +0000 |
| commit | ba21f3637807e5bd0a3b95dae74965dbf27a44a6 (patch) | |
| tree | 54cd174eb88776cf56627e658166b74a482d9de0 /gcc/ginclude/stddef.h | |
| parent | 7b03df733453a664ec5d06580c22078d47940e4e (diff) | |
| download | gcc-ba21f3637807e5bd0a3b95dae74965dbf27a44a6.tar.gz | |
* collect2.c (resolve_lib_name): Move '/' check to more rational place.
* ginclude/stddef.h (NULL): define for non-gnu C++ parsers as 0.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34687 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ginclude/stddef.h')
| -rw-r--r-- | gcc/ginclude/stddef.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index 41f8f033a0d..a964410bfb7 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1989, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of GNU CC. @@ -356,7 +356,11 @@ typedef __WINT_TYPE__ wint_t; #ifdef __GNUG__ #define NULL __null #else /* G++ */ +#ifndef __cplusplus #define NULL ((void *)0) +#else /* C++ */ +#define NULL 0 +#endif /* C++ */ #endif /* G++ */ #endif /* NULL not defined and <stddef.h> or need NULL. */ #undef __need_NULL |