stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r646133 - /stdcxx/trunk/include/rw/_mbstate.h
Date Tue, 08 Apr 2008 23:23:39 GMT
Author: sebor
Date: Tue Apr  8 16:23:39 2008
New Revision: 646133

URL: http://svn.apache.org/viewvc?rev=646133&view=rev
Log:
2008-04-08  Martin Sebor  <sebor@roguewave.com>

	STDCXX-843
	* include/rw/_mbstate.h [_RWSTD_OS_SUNOS] (__mbstate_t): Used
	_RWSTD_LONG_SIZE instead of testing the _LP64 system macro
	which may or may not be #defined, depending on the already
	#included headers.

Modified:
    stdcxx/trunk/include/rw/_mbstate.h

Modified: stdcxx/trunk/include/rw/_mbstate.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_mbstate.h?rev=646133&r1=646132&r2=646133&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_mbstate.h (original)
+++ stdcxx/trunk/include/rw/_mbstate.h Tue Apr  8 16:23:39 2008
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2005-2006 Rogue Wave Software.
+ * Copyright 2005-2008 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -162,11 +162,14 @@
 // avoid namespace pollution on Solaris
 typedef struct __mbstate_t {
 
-#      ifdef _LP64
+       // Sun uses _LP64 in their header but the macro may not
+       // yetbe #defined at this point, depending on what other
+       // headers have been #included
+#      if 8 == _RWSTD_LONG_SIZE   // LP64
     long __filler [4];
 #      else
     int __filler [6];
-#      endif   // _LP64
+#      endif   // 8 == sizeof(long)
 } __mbstate_t;
 
 }   // extern "C"



Mime
View raw message