diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2006-10-26 19:43:24 +0400 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2006-10-26 19:43:24 +0400 |
| commit | 4fecf3ec9713f5ca17b0d1ecc5dc9fdcd4bfaafc (patch) | |
| tree | 47b559f888375c32b34f8fb7a076aeee5417ebbe | |
| parent | 8b463a35b5f3f04137535b3cff08cedd9063e974 (diff) | |
Merge from HEAD:newlib-csl-sourcerygxx-4_1-26newlib-csl-arm-2006q3-26
newlib/
* libc/include/math.h: (exception): Add a comment
telling fixincludes that we handle C vs. C++ issue.
| -rw-r--r-- | ChangeLog.csl | 7 | ||||
| -rw-r--r-- | newlib/libc/include/math.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index a79cea4e0..31769a045 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,10 @@ +2006-10-25 Vladimir Prus <vladimir@codesourcery.com> + + Merge from HEAD: + newlib/ + * libc/include/math.h: (exception): Add a comment + telling fixincludes that we handle C vs. C++ issue. + 2006-10-23 Paul Brook <paul@codesourcery.com> libgloss/ diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h index 41ce752b3..ee91868d1 100644 --- a/newlib/libc/include/math.h +++ b/newlib/libc/include/math.h @@ -336,7 +336,8 @@ extern int *__signgam _PARAMS((void)); #define __signgam_r(ptr) _REENT_SIGNGAM(ptr) /* The exception structure passed to the matherr routine. */ - +/* We have a problem when using C++ since `exception' is a reserved + name in C++. */ #ifdef __cplusplus struct __exception #else |