You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2005/11/23 22:20:54 UTC
svn commit: r348564 - in /incubator/stdcxx/trunk/include: ansi/cerrno
ansi/errno.h rw/_defs.h
Author: sebor
Date: Wed Nov 23 13:20:48 2005
New Revision: 348564
URL: http://svn.apache.org/viewcvs?rev=348564&view=rev
Log:
2005-11-23 Martin Sebor <se...@roguewave.com>
STDCXX-71
* cerrno: Avoided #undefining errno.
* errno.h: Same.
* _defs.h: Used quotes instead of pointy brackets in the defintion
of the _RWSTD_ANSI_C_ERRNO_H and _RWSTD_CERRNO macros to prevent
the errno macro from expanding.
Modified:
incubator/stdcxx/trunk/include/ansi/cerrno
incubator/stdcxx/trunk/include/ansi/errno.h
incubator/stdcxx/trunk/include/rw/_defs.h
Modified: incubator/stdcxx/trunk/include/ansi/cerrno
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/ansi/cerrno?rev=348564&r1=348563&r2=348564&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/cerrno (original)
+++ incubator/stdcxx/trunk/include/ansi/cerrno Wed Nov 23 13:20:48 2005
@@ -3,7 +3,7 @@
*
* cerrno - C++ Standard library interface to the ANSI C header errno.h
*
- * $Id: //stdlib/dev/include/ansi/cerrno#16 $
+ * $Id$
*
***************************************************************************
*
@@ -51,8 +51,8 @@
#ifndef _RWSTD_CERRNO_INCLUDED
#define _RWSTD_CERRNO_INCLUDED
-#if !defined (errno) || !defined (EDOM) || !defined (ERANGE) || !defined (EAGAIN)
-# undef errno
+#if !defined (errno) \
+ || !defined (EDOM) || !defined (ERANGE) || !defined (EAGAIN)
# include _RWSTD_ANSI_C_ERRNO_H
#endif // errno ...
Modified: incubator/stdcxx/trunk/include/ansi/errno.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/ansi/errno.h?rev=348564&r1=348563&r2=348564&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/errno.h (original)
+++ incubator/stdcxx/trunk/include/ansi/errno.h Wed Nov 23 13:20:48 2005
@@ -2,7 +2,7 @@
*
* errno.h
*
- * $Id: //stdlib/dev/include/ansi/errno.h#16 $
+ * $Id$
*
***************************************************************************
*
@@ -45,14 +45,9 @@
#else
-# if !defined (errno) || !defined (EDOM) || !defined (ERANGE) || !defined (EAGAIN)
-
- // Preventing errno from being expanded in case it has been
- // defined by a previous inclusion of stdlib.h header
-# undef errno
-
+# if !defined (errno) \
+ || !defined (EDOM) || !defined (ERANGE) || !defined (EAGAIN)
# include _RWSTD_ANSI_C_ERRNO_H
-# endif // errno
+# endif // errno ...
#endif // _RWSTD_NO_DEPRECATED_C_HEADERS
-
Modified: incubator/stdcxx/trunk/include/rw/_defs.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_defs.h?rev=348564&r1=348563&r2=348564&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_defs.h (original)
+++ incubator/stdcxx/trunk/include/rw/_defs.h Wed Nov 23 13:20:48 2005
@@ -84,7 +84,7 @@
# define _RWSTD_CASSERT <assert.h>
# define _RWSTD_CCTYPE <ctype.h>
-# define _RWSTD_CERRNO <errno.h>
+# define _RWSTD_CERRNO "errno.h"
# define _RWSTD_CFLOAT <float.h>
# define _RWSTD_CISO646 <iso646.h>
# define _RWSTD_CLIMITS <limits.h>
@@ -131,7 +131,9 @@
# define _RWSTD_ANSI_C_CTYPE_H <../include/crt/ctype.h>
# endif
# if !defined (_RWSTD_NO_ERRNO_H) && !defined (_RWSTD_ANSI_C_ERRNO_H)
-# define _RWSTD_ANSI_C_ERRNO_H <../include/crt/errno.h>
+ // pathname quoted in order to prevent the errno macro
+ // from expanding in the include directive
+# define _RWSTD_ANSI_C_ERRNO_H "../include/crt/errno.h"
# endif
# if !defined (_RWSTD_NO_FLOAT_H) && !defined (_RWSTD_ANSI_C_FLOAT_H)
# define _RWSTD_ANSI_C_FLOAT_H <../include/crt/float.h>
@@ -197,7 +199,9 @@
# undef _RWSTD_ANSI_C_CTYPE_H
# define _RWSTD_ANSI_C_CTYPE_H <../include/ctype.h>
# undef _RWSTD_ANSI_C_ERRNO_H
-# define _RWSTD_ANSI_C_ERRNO_H <../include/errno.h>
+ // pathname quoted in order to prevent the errno macro
+ // from expanding in the include directive
+# define _RWSTD_ANSI_C_ERRNO_H "../include/errno.h"
# undef _RWSTD_ANSI_C_FLOAT_H
# define _RWSTD_ANSI_C_FLOAT_H <../include/float.h>
# undef _RWSTD_ANSI_C_ISO646_H
@@ -249,7 +253,9 @@
# define _RWSTD_ANSI_C_CTYPE_H </usr/include/ctype.h>
# endif
# if !defined (_RWSTD_NO_ERRNO_H) && !defined (_RWSTD_ANSI_C_ERRNO_H)
-# define _RWSTD_ANSI_C_ERRNO_H </usr/include/errno.h>
+ // pathname quoted in order to prevent the errno macro
+ // from expanding in the include directive
+# define _RWSTD_ANSI_C_ERRNO_H "/usr/include/errno.h"
# endif
# if !defined (_RWSTD_NO_FLOAT_H) && !defined (_RWSTD_ANSI_C_FLOAT_H)
# define _RWSTD_ANSI_C_FLOAT_H </usr/include/float.h>
@@ -317,7 +323,9 @@
# define _RWSTD_ANSI_C_CTYPE_H <../include/ctype.h>
# endif
# if !defined (_RWSTD_NO_ERRNO_H) && !defined (_RWSTD_ANSI_C_ERRNO_H)
-# define _RWSTD_ANSI_C_ERRNO_H <../include/errno.h>
+ // pathname quoted in order to prevent the errno macro
+ // from expanding in the include directive
+# define _RWSTD_ANSI_C_ERRNO_H "../include/errno.h"
# endif
# if !defined (_RWSTD_NO_FLOAT_H) && !defined (_RWSTD_ANSI_C_FLOAT_H)
# define _RWSTD_ANSI_C_FLOAT_H <../include/float.h>