diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-04-16 23:11:22 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-04-16 23:12:49 +0300 |
commit | 70b45b2f55174bbdbf254f3efa755ffddb3d2721 (patch) | |
tree | e080f7d42b05079b099bceb47f16d5f3a295bfe2 /include | |
parent | c3fa18254a24c1f260ff655fce9f100da800a28c (diff) |
Move {pre,post}x.h to where {pre,post}mac.h and {pre,post}win.h are
Change-Id: I561aa6cc1de7ed6128d25c82cd493d5d5718e052
Diffstat (limited to 'include')
-rw-r--r-- | include/postx.h | 65 | ||||
-rw-r--r-- | include/prex.h | 60 |
2 files changed, 125 insertions, 0 deletions
diff --git a/include/postx.h b/include/postx.h new file mode 100644 index 000000000000..7bce135d5a4f --- /dev/null +++ b/include/postx.h @@ -0,0 +1,65 @@ +/* -*- 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/include/prex.h b/include/prex.h new file mode 100644 index 000000000000..e513880b0523 --- /dev/null +++ b/include/prex.h @@ -0,0 +1,60 @@ +/* -*- 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: */ |