summaryrefslogtreecommitdiff
path: root/Xext/panoramiX.c
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-04-26 15:05:06 -0700
committerJamey Sharp <jamey@minilop.net>2010-04-26 19:19:02 -0700
commit7e573b5ccd2c759f74ebb84d3a5a23da6b88ec6d (patch)
tree1cf1743aecf31d7f1bba30e59d158f5344ba4eea /Xext/panoramiX.c
parente372cc58e02391c3e8e82ac03f73fbe8b1f7d49c (diff)
Kill unused/useless macros in panoramiX.h: BREAK_IF, IF_RETURN, FORCE_ROOT
This header doesn't seem to be used outside the server tree, so I don't think anything was depending on these except what I've fixed in this patch. FORCE_ROOT is not used anywhere, and never has been in all the history that's in git. ajax removed its FORCE_WIN and FORCE_CMAP companions three years ago, in 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4. BREAK_IF and IF_RETURN expanded to exactly the keywords in their names, which is silly. They were rarely used and served only to make callers inconsistent with the idioms used elsewhere in the server. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'Xext/panoramiX.c')
-rw-r--r--Xext/panoramiX.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 96eb8f9e1..d5965c2d0 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -476,7 +476,8 @@ void PanoramiXExtensionInit(int argc, char *argv[])
panoramiXdataPtr = (PanoramiXData *)
xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
- BREAK_IF(!panoramiXdataPtr);
+ if (!panoramiXdataPtr)
+ break;
if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {
noPanoramiXExtension = TRUE;