From 7af5e3d68d67441e1ff3bed8a95dc4789ed6ed5d Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Wed, 3 Aug 2016 01:57:46 -0700 Subject: [PATCH] Dont redefine abort() as it may leak into other files Summary: Anyone importing this header would have abort() redefined to nothing. That's not good. Fix mistake by defining a CSS_ABORT() macro instead. Differential Revision: D3661871 fbshipit-source-id: 14a9d076299b4f21d17a2bed68aa30b796c438a5 --- CSSLayout/CSSMacros.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CSSLayout/CSSMacros.h b/CSSLayout/CSSMacros.h index abd0bba4..fdb119c7 100644 --- a/CSSLayout/CSSMacros.h +++ b/CSSLayout/CSSMacros.h @@ -21,12 +21,14 @@ #define FB_ASSERTIONS_ENABLED 1 #endif -#if !(FB_ASSERTIONS_ENABLED) -#define abort() +#if FB_ASSERTIONS_ENABLED +#define CSS_ABORT() abort() +#else +#define CSS_ABORT() #endif #define CSS_ASSERT(X, message) \ if (!(X)) { \ fprintf(stderr, "%s\n", message); \ - abort(); \ + CSS_ABORT(); \ }