Index: third_party/tcmalloc/chromium/src/windows/port.h |
=================================================================== |
--- third_party/tcmalloc/chromium/src/windows/port.h (revision 124832) |
+++ third_party/tcmalloc/chromium/src/windows/port.h (working copy) |
@@ -65,15 +65,14 @@ |
/* |
* 4018: signed/unsigned mismatch is common (and ok for signed_i < unsigned_i) |
- * 4244: otherwise we get problems when subtracting two size_t's to an int |
+ * 4244: otherwise we get problems when substracting two size_t's to an int |
* 4288: VC++7 gets confused when a var is defined in a loop and then after it |
* 4267: too many false positives for "conversion gives possible data loss" |
* 4290: it's ok windows ignores the "throw" directive |
* 4996: Yes, we're ok using "unsafe" functions like vsnprintf and getenv() |
- * 4146: internal_logging.cc intentionally negates an unsigned value |
*/ |
#ifdef _MSC_VER |
-#pragma warning(disable:4018 4244 4288 4267 4290 4996 4146) |
+#pragma warning(disable:4018 4244 4288 4267 4290 4996) |
#endif |
#ifndef __cplusplus |
@@ -166,10 +165,6 @@ |
#endif /* __cplusplus */ |
#endif /* HAVE_PTHREAD */ |
-inline void sched_yield(void) { |
- Sleep(0); |
-} |
- |
/* |
* __declspec(thread) isn't usable in a dll opened via LoadLibrary(). |
* But it doesn't work to LoadLibrary() us anyway, because of all the |
@@ -265,7 +260,7 @@ |
#define MAP_PRIVATE MEM_COMMIT |
#define MAP_SHARED MEM_RESERVE /* value of this #define is 100% arbitrary */ |
-#if __STDC__ && !defined(__MINGW32__) |
+#if __STDC__ |
typedef _off_t off_t; |
#endif |
@@ -377,6 +372,7 @@ |
inline int mkdir(const char *pathname, int) { |
return _mkdir(pathname); |
} |
+#endif |
inline FILE *popen(const char *command, const char *type) { |
return _popen(command, type); |
@@ -384,14 +380,13 @@ |
inline int pclose(FILE *stream) { |
return _pclose(stream); |
} |
-#endif |
EXTERN_C PERFTOOLS_DLL_DECL void WriteToStderr(const char* buf, int len); |
/* ----------------------------------- SYSTEM/PROCESS */ |
typedef int pid_t; |
-#if __STDC__ && !defined(__MINGW32__) |
+#if __STDC__ |
inline pid_t getpid(void) { return _getpid(); } |
#endif |
inline pid_t getppid(void) { return 0; } |
@@ -415,14 +410,10 @@ |
return 0; |
} |
-// mingw64 seems to define timespec (though mingw.org mingw doesn't), |
-// protected by the _TIMESPEC_DEFINED macro. |
-#ifndef _TIMESPEC_DEFINED |
struct timespec { |
int tv_sec; |
int tv_nsec; |
}; |
-#endif |
inline int nanosleep(const struct timespec *req, struct timespec *rem) { |
Sleep(req->tv_sec * 1000 + req->tv_nsec / 1000000); |