688N/A#

688N/A# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.

919N/A#

688N/A# Permission is hereby granted, free of charge, to any person obtaining a

688N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

919N/A#

688N/A#

688N/A#

688N/A

688N/ASolaris already has the old XPanoramiX* API in libXext, so we don't export

688N/Ait from libXinerama to avoid symbol clashes.

688N/A

688N/Adiff -urp -x '*~' -x '*.orig' src/Xinerama.c src/Xinerama.c

688N/A--- src/Xinerama.c 2010-10-06 21:13:01.000000000 -0700

688N/A+++ src/Xinerama.c 2011-02-11 16:43:46.565053733 -0800

688N/A@@ -72,6 +72,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (clos

688N/A * *

688N/A ****************************************************************************/

688N/A

688N/A+#ifdef SUNSOFT

688N/A+static inline

688N/A+#endif /* SUNSOFT */

688N/A Bool XPanoramiXQueryExtension (

688N/A Display *dpy,

688N/A int *event_base_return,

688N/A@@ -90,6 +93,9 @@ Bool XPanoramiXQueryExtension (

688N/A }

688N/A

688N/A

688N/A+#ifdef SUNSOFT

688N/A+static inline

688N/A+#endif /* SUNSOFT */

688N/A Status XPanoramiXQueryVersion(

688N/A Display *dpy,

688N/A int *major_version_return,

688N/A@@ -120,6 +126,7 @@ Status XPanoramiXQueryVersion(

688N/A return 1;

688N/A }

688N/A

688N/A+#ifndef SUNSOFT

688N/A XPanoramiXInfo *XPanoramiXAllocInfo(void)

688N/A {

688N/A return (XPanoramiXInfo *) Xmalloc (sizeof (XPanoramiXInfo));

688N/A@@ -215,6 +222,7 @@ Status XPanoramiXGetScreenSize (

688N/A panoramiX_info->height = rep.height;

688N/A return 1;

688N/A }

688N/A+#endif /* SUNSOFT */

688N/A

688N/A /*******************************************************************\

688N/A Alternate interface to make up for shortcomings in the original,

688N/A