diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2000-06-24 18:19:46 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-06-24 18:19:46 -0400 |
| commit | be78ffb2267dfe051d8e5bf9d92fcdda8ad323d1 (patch) | |
| tree | 54cd174eb88776cf56627e658166b74a482d9de0 /gcc/ginclude/stddef.h | |
| parent | 40f1e34222f69708080b45b2b93a3b8551bf4ab1 (diff) | |
| download | gcc-be78ffb2267dfe051d8e5bf9d92fcdda8ad323d1.zip gcc-be78ffb2267dfe051d8e5bf9d92fcdda8ad323d1.tar.gz gcc-be78ffb2267dfe051d8e5bf9d92fcdda8ad323d1.tar.bz2 | |
collect2.c (resolve_lib_name): Move '/' check to more rational place.
* collect2.c (resolve_lib_name): Move '/' check to more rational place.
* ginclude/stddef.h (NULL): define for non-gnu C++ parsers as 0.
From-SVN: r34687
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 41f8f03..a964410 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 |