summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-27 18:21:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-27 18:21:42 +0000
commitca46e4581860a244160022620f640932efada56e (patch)
treefe9f10a3d4d3c089cdbb51e49b8251edc0ab6dbc
parentaf70611ed21768981f218c7e395da6bc32dd5cee (diff)
downloadxorg-proto-xineramaproto-XINERAMA_2.tar.gz
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it hasXINERAMA_2
been decided that the priority is to preserve the server's internal API/ABI so that third-party drivers that depend on symbols like noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc on Linux doesn't support ELF's weak symbols as that would have been a reasonable solution for preserving the ABI. N.B.: While symbols, i.e. functions and variables revert to the old name, I did not revert build names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and it's just a build issue that has no impact on the binary output of the build.
-rw-r--r--Xinerama.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/Xinerama.h b/Xinerama.h
index daf7be2..80b8682 100644
--- a/Xinerama.h
+++ b/Xinerama.h
@@ -31,16 +31,6 @@ in this Software without prior written authorization from The Open Group.
#define _XINERAMA_H
#include <X11/Xfuncproto.h>
-
-#ifndef XNOXINERAMABC
-typedef struct {
- int screen_number;
- short x_org;
- short y_org;
- short width;
- short height;
-} XineramaScreenInfo;
-#endif
_XFUNCPROTOBEGIN
@@ -60,12 +50,6 @@ Bool XineramaActive (
Display *dpy,
Window window
);
-
-#ifndef XNOXINERAMABC
-Bool XineramaIsActive (
- Display *dpy
-);
-#endif
Status XineramaGetData(
Display *dpy,
@@ -74,13 +58,6 @@ Status XineramaGetData(
int *number_framebuffers
);
-#ifndef XNOXINERAMABC
-XineramaScreenInfo *XineramaQueryScreens (
- Display *dpy,
- int *number
-);
-#endif
-
Status XineramaGetCenterHint (
Display *dpy,
Window root,