summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-03-02 00:53:20 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-03-02 00:53:20 +0000
commit7a75d3351e1bf492eb35964402461fb826514367 (patch)
treea4d5fd6e7a0e22e366575ca53f29b292e5b37ac2 /lib
parent1afe25638d1046eb636fa3b5372afe37cb6b8e8d (diff)
Don't declare struct exception if __cplusplus is defined as it
conflicts with gcc's exception handling stuff. This should really only be visible when building libm I think, and I will do that once I confer with others. Required for libg++ 2.8.0.
Diffstat (limited to 'lib')
-rw-r--r--lib/libm/src/math.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libm/src/math.h b/lib/libm/src/math.h
index 2c7ab5142ef..0c9a51bc941 100644
--- a/lib/libm/src/math.h
+++ b/lib/libm/src/math.h
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $Id: math.h,v 1.2 1995/10/28 00:57:18 deraadt Exp $
+ * $Id: math.h,v 1.3 1998/03/02 00:53:19 millert Exp $
*/
#ifndef _MATH_H_
@@ -64,6 +64,7 @@ extern _LIB_VERSION_TYPE _LIB_VERSION;
#define _XOPEN_ fdlibm_xopen
#define _POSIX_ fdlibm_posix
+#ifndef __cplusplus
struct exception {
int type;
char *name;
@@ -71,6 +72,7 @@ struct exception {
double arg2;
double retval;
};
+#endif
#define HUGE MAXFLOAT