summaryrefslogtreecommitdiff
path: root/tools/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-16 23:11:22 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-16 23:12:49 +0300
commit70b45b2f55174bbdbf254f3efa755ffddb3d2721 (patch)
treee080f7d42b05079b099bceb47f16d5f3a295bfe2 /tools/inc
parentc3fa18254a24c1f260ff655fce9f100da800a28c (diff)
Move {pre,post}x.h to where {pre,post}mac.h and {pre,post}win.h are
Change-Id: I561aa6cc1de7ed6128d25c82cd493d5d5718e052
Diffstat (limited to 'tools/inc')
-rw-r--r--tools/inc/tools/postx.h65
-rw-r--r--tools/inc/tools/prex.h60
2 files changed, 0 insertions, 125 deletions
diff --git a/tools/inc/tools/postx.h b/tools/inc/tools/postx.h
deleted file mode 100644
index 7bce135d5a4f..000000000000
--- a/tools/inc/tools/postx.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _POSTX_H
-#define _POSTX_H
-
-#if defined __cplusplus
-}
-#endif
-
-/* X Types */
-#undef Window
-#undef BYTE
-#undef INT8
-#undef INT64
-#undef BOOL
-#undef Font
-#undef Cursor
-#undef String
-#undef KeyCode
-#undef Region
-#undef Icon
-#undef Time
-#undef Boolean
-
-#undef Min
-#undef Max
-#undef DestroyAll
-#undef Success
-
-#undef Printer
-#undef Orientation
-
-#undef GetToken
-#undef ReleaseToken
-#undef InitializeToken
-#undef NextRequest
-
-#ifdef KeyPress
-#if KeyPress != 2
-Error KeyPress must be Equal 2
-#endif
-#undef KeyPress
-#endif
-#define XLIB_KeyPress 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
deleted file mode 100644
index e513880b0523..000000000000
--- a/tools/inc/tools/prex.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _PREX_H
-#define _PREX_H
-
-/* Types from <X11/X.h> that clash with LO's identifiers
- * and we don't need.
- */
-#define Boolean HIDE_XLIB_Boolean
-#define Font HIDE_XLIB_Font
-#define Icon HIDE_XLIB_Icon
-#define String HIDE_XLIB_String
-
-/* Types from <X11/X.h> that clash, but we do use. */
-#define Cursor XLIB_Cursor
-#define KeyCode XLIB_KeyCode
-#define Region XLIB_Region
-#define Time XLIB_Time
-#define Window XLIB_Window
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/StringDefs.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/XKBlib.h>
-
-/* From <X11/Intrinsic.h> */
-typedef unsigned long Pixel;
-
-#undef String
-#define String XLIB_String
-
-#undef KeyCode
-#define KeyCode XLIB_KeyCode //undef in intrinsics
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */