Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: Source/wtf/Platform.h

Issue 14516007: Remove OS(IOS) and OS(MAC_OS_X) guards. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/wtf/FastMalloc.cpp ('k') | Source/wtf/ThreadingPthreads.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
3 * Copyright (C) 2007-2009 Torch Mobile, Inc. 3 * Copyright (C) 2007-2009 Torch Mobile, Inc.
4 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 /* OS(DARWIN) - Any Darwin-based OS, including Mac OS X and iPhone OS */ 315 /* OS(DARWIN) - Any Darwin-based OS, including Mac OS X and iPhone OS */
316 #ifdef __APPLE__ 316 #ifdef __APPLE__
317 #define WTF_OS_DARWIN 1 317 #define WTF_OS_DARWIN 1
318 318
319 #include <Availability.h> 319 #include <Availability.h>
320 #include <AvailabilityMacros.h> 320 #include <AvailabilityMacros.h>
321 #include <TargetConditionals.h> 321 #include <TargetConditionals.h>
322 #endif 322 #endif
323 323
324 /* OS(IOS) - iOS */
325 /* OS(MAC_OS_X) - Mac OS X (not including iOS) */
326 #if OS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
327 || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
328 || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
329 #define WTF_OS_IOS 1
330 #elif OS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
331 #define WTF_OS_MAC_OS_X 1
332 #endif
333
334 /* OS(FREEBSD) - FreeBSD */ 324 /* OS(FREEBSD) - FreeBSD */
335 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__ ) 325 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__ )
336 #define WTF_OS_FREEBSD 1 326 #define WTF_OS_FREEBSD 1
337 #endif 327 #endif
338 328
339 /* OS(HURD) - GNU/Hurd */ 329 /* OS(HURD) - GNU/Hurd */
340 #ifdef __GNU__ 330 #ifdef __GNU__
341 #define WTF_OS_HURD 1 331 #define WTF_OS_HURD 1
342 #endif 332 #endif
343 333
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 471
482 #if !defined(ENABLE_THREADING_LIBDISPATCH) && HAVE(DISPATCH_H) 472 #if !defined(ENABLE_THREADING_LIBDISPATCH) && HAVE(DISPATCH_H)
483 #define ENABLE_THREADING_LIBDISPATCH 1 473 #define ENABLE_THREADING_LIBDISPATCH 1
484 #elif !defined(ENABLE_THREADING_OPENMP) && defined(_OPENMP) 474 #elif !defined(ENABLE_THREADING_OPENMP) && defined(_OPENMP)
485 #define ENABLE_THREADING_OPENMP 1 475 #define ENABLE_THREADING_OPENMP 1
486 #elif !defined(THREADING_GENERIC) 476 #elif !defined(THREADING_GENERIC)
487 #define ENABLE_THREADING_GENERIC 1 477 #define ENABLE_THREADING_GENERIC 1
488 #endif 478 #endif
489 479
490 #endif /* WTF_Platform_h */ 480 #endif /* WTF_Platform_h */
OLDNEW
« no previous file with comments | « Source/wtf/FastMalloc.cpp ('k') | Source/wtf/ThreadingPthreads.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698