This is an archive of the discontinued LLVM Phabricator instance.

cctype: tweak inclusions for _LIBCPP_MSVCRT case
ClosedPublic

Authored by abdulras on Feb 4 2015, 2:08 PM.

Download Raw Diff

Details

Reviewers

Summary

cctype uses ctype function such as isblank. However, when building against
msvcrt, this is provided by the support header. Include the support header if
building for Windows to ensure that the definition is properly visible.

Diff Detail

Event Timeline

abdulras updated this revision to Diff 19348.Feb 4 2015, 2:08 PM

abdulras retitled this revision from to cctype: tweak inclusions for _LIBCPP_MSVCRT case.

abdulras updated this object.

abdulras edited the test plan for this revision. (Show Details)

abdulras added a reviewer: mclow.lists.

abdulras set the repository for this revision to rL LLVM.

abdulras added a subscriber: compnerd.

abdulras added a subscriber: Unknown Object (MLST).Feb 4 2015, 2:11 PM

I don't have any objections to this; however, my windows box is down right now, so I can't test it.

Is this fix correct for all the versions of VC++ that we support?

The header doesn't have anything that is version specific, so I believe that this is safe for all the versions that we support.

mclow.lists accepted this revision.Feb 13 2015, 1:16 PM

mclow.lists edited edge metadata.

This revision is now accepted and ready to land.Feb 13 2015, 1:16 PM

Committed in SVN r229161.

Revision Contents

Path

Size

include/

cctype

1 line

Diff 19348

include/cctype

	Show All 33 Lines

	} // std			} // std
	*/			*/

	#include <__config>			#include <__config>
	#include <ctype.h>			#include <ctype.h>
	#if defined(_LIBCPP_MSVCRT)			#if defined(_LIBCPP_MSVCRT)
	#include "support/win32/support.h"			#include "support/win32/support.h"
				#include "support/win32/locale_win32.h"
	#endif // _LIBCPP_MSVCRT			#endif // _LIBCPP_MSVCRT

	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)			#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
	#pragma GCC system_header			#pragma GCC system_header
	#endif			#endif

	_LIBCPP_BEGIN_NAMESPACE_STD			_LIBCPP_BEGIN_NAMESPACE_STD

	▲ Show 20 Lines • Show All 115 Lines • Show Last 20 Lines