--- opt/intel/compiler60/ia32/include/yvals.h.orig	Wed Apr 24 12:13:04 2002
+++ opt/intel/compiler60/ia32/include/yvals.h	Wed Apr 24 12:13:26 2002
@@ -4,10 +4,6 @@
 #define _YVALS
 #include <stdarg.h>
 
-#include <features.h>	/* Get glibc version __GLIBC__ and __GLIBC_MINOR__*/
-#define __GLIBC_2_2     ((__GLIBC__ > 2) || ((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 2)))
-			/* true if glibc-2.2 and older is used */
-
 #define _CPPLIB_VER	310
 
  #if defined(ia64) || defined(__ia64) || defined(__ia64__)	/* assume Itanium */
--- opt/intel/compiler60/ia32/include/cwchar.orig	Tue Aug  6 04:32:48 2002
+++ opt/intel/compiler60/ia32/include/cwchar	Tue Aug  6 05:04:09 2002
@@ -13,25 +13,29 @@
 
  #ifdef _GLOBAL_USING
 _STD_BEGIN
-using ::mbstate_t; using ::size_t; using ::tm; using ::wint_t;
+using ::mbstate_t; using ::size_t; using ::wint_t;
+// using ::tm;
 
 
-using ::btowc;
+// using ::btowc;
 // using ::fwide; using ::fwprintf;
 // using ::fwscanf;
-using ::mbrlen; using ::mbrtowc; using ::mbsrtowcs;
-using ::mbsinit;
+// using ::mbrlen; using ::mbrtowc; using ::mbsrtowcs;
+// using ::mbsinit;
 // using ::swprintf; using ::swscanf;
 // using ::vfwprintf; using ::vswprintf; using ::vwprintf;
-using ::wcrtomb;
+// using ::wcrtomb;
 // using ::wprintf; using ::wscanf;
-using ::wcsrtombs; using ::wcstol; using ::wcscat;
-using ::wcschr; using ::wcscmp; using ::wcscoll;
+// using ::wcsrtombs; using ::wcstol;
+using ::wcscat;
+using ::wcschr; using ::wcscmp;
+// using ::wcscoll;
 using ::wcscpy; using ::wcscspn; using ::wcslen;
 using ::wcsncat; using ::wcsncmp; using ::wcsncpy;
 using ::wcspbrk; using ::wcsrchr; using ::wcsspn;
-using ::wcstod; using ::wcstoul; using ::wcsstr;
-using ::wcstok; using ::wcsxfrm; using ::wctob;
+// using ::wcstod; using ::wcstoul;
+using ::wcsstr;
+// using ::wcstok; using ::wcsxfrm; using ::wctob;
 using ::wmemchr; using ::wmemcmp; using ::wmemcpy;
 using ::wmemmove; using ::wmemset;
 // using ::wcsftime;
--- opt/intel/compiler60/ia32/include/cfloat.orig	Thu Sep 12 07:08:29 2002
+++ opt/intel/compiler60/ia32/include/cfloat	Thu Sep 12 08:01:57 2002
@@ -6,35 +6,6 @@
 
 #include <float.h>
 
- #if __EDG__
-_C_STD_BEGIN
-		/* TYPE DEFINITIONS */
-typedef struct
-	{	/* parameters for a floating-point type */
-	int _Ddig, _Dmdig, _Dmax10e, _Dmaxe, _Dmin10e, _Dmine;
-	union
-		{	/* union of short array and all floats */
-		unsigned short _Us[8];
-		float _Float;
-		double _Double;
-		long double _Long_double;
-		} _Deps, _Dmax, _Dmin;
-	} _Dvals;
-
-		/* DECLARATIONS */
-_C_LIB_DECL
-extern const _Dvals _Ldbl;
-_END_C_LIB_DECL
-_C_STD_END
-
-#undef LDBL_EPSILON	/* redefine macros that use gcc extension */
-#undef LDBL_MAX
-#undef LDBL_MIN
-
-#define LDBL_EPSILON	_CSTD _Ldbl._Deps._Long_double
-#define LDBL_MAX		_CSTD _Ldbl._Dmax._Long_double
-#define LDBL_MIN		_CSTD _Ldbl._Dmin._Long_double
- #endif /* __EDG__ */
 #endif /* _CFLOAT_ */
 
 /*
