projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h\r |
| 2 | index 86fd0f9..ccad11e 100644\r | |
| 3 | --- a/folly/portability/Windows.h\r | |
| 4 | +++ b/folly/portability/Windows.h\r | |
| 5 | @@ -32,24 +32,17 @@\r | |
| 6 | // disabled to ensure all of the normal names get declared properly.\r | |
| 7 | #include <stdio.h>\r | |
| 8 | \r | |
| 9 | -#ifndef __STDC__\r | |
| 10 | -/* nolint */\r | |
| 11 | -#define __STDC__ 1\r | |
| 12 | #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES")\r | |
| 13 | #ifdef _CRT_DECLARE_NONSTDC_NAMES\r | |
| 14 | #undef _CRT_DECLARE_NONSTDC_NAMES\r | |
| 15 | #endif\r | |
| 16 | +\r | |
| 17 | +#include <corecrt.h>\r | |
| 18 | #pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")\r | |
| 19 | -#undef _CRT_INTERNAL_NONSTDC_NAMES\r | |
| 20 | -#include <direct.h> // @manual nolint\r | |
| 21 | -#include <io.h> // @manual nolint\r | |
| 22 | -#undef __STDC__\r | |
| 23 | +#define _CRT_INTERNAL_NONSTDC_NAMES 0\r | |
| 24 | +#include <direct.h>\r | |
| 25 | +#include <io.h>\r | |
| 26 | #pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")\r | |
| 27 | -#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")\r | |
| 28 | -#else\r | |
| 29 | -#include <direct.h> // @manual nolint\r | |
| 30 | -#include <io.h> // @manual nolint\r | |
| 31 | -#endif\r | |
| 32 | \r | |
| 33 | #if defined(min) || defined(max)\r | |
| 34 | #error Windows.h needs to be included by this header, or else NOMINMAX needs \\r |