493N/A#

493N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.

493N/A# Use is subject to license terms.

493N/A#

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

919N/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

493N/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

493N/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

493N/A# DEALINGS IN THE SOFTWARE.

493N/A#

341N/A#

341N/A#

341N/A

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

341N/Ait from libXinerama to avoid symbol clashes.

341N/A

341N/A--- src/Xinerama.c 2007-03-01 15:41:16.000000000 -0800

341N/A+++ src/Xinerama.c 2007-03-07 14:50:49.899520000 -0800

341N/A@@ -76,6 +76,9 @@

493N/A * *

493N/A ****************************************************************************/

341N/A

493N/A+#ifdef SUNSOFT

493N/A+static inline

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

493N/A Bool XPanoramiXQueryExtension (

493N/A Display *dpy,

493N/A int *event_basep,

493N/A@@ -94,6 +97,9 @@

493N/A }

493N/A

493N/A

493N/A+#ifdef SUNSOFT

493N/A+static inline

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

493N/A Status XPanoramiXQueryVersion(

493N/A Display *dpy,

493N/A int *major_versionp,

341N/A@@ -124,6 +130,7 @@

341N/A return 1;

493N/A }

493N/A

493N/A+#ifndef SUNSOFT

493N/A XPanoramiXInfo *XPanoramiXAllocInfo(void)

493N/A {

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

493N/A@@ -219,6 +226,7 @@

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

493N/A return 1;

493N/A }

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

493N/A

493N/A /*******************************************************************\

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

493N/A