126N/A#

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

126N/A#

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

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

126N/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.

126N/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.

126N/A#

126N/A#

126N/A#

126N/A

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

126N/Ait from libXinerama to avoid symbol clashes.

126N/A

1370N/Adiff --git a/src/Xinerama.c b/src/Xinerama.c

1370N/Aindex 67a35b5..e0e5c5d 100644

1370N/A--- a/src/Xinerama.c

1370N/A+++ b/src/Xinerama.c

1370N/A@@ -89,6 +89,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, panoramiX_ext_info)

126N/A * *

126N/A ****************************************************************************/

126N/A

126N/A+#ifdef SUNSOFT

126N/A+static inline

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

126N/A Bool XPanoramiXQueryExtension (

126N/A Display *dpy,

1072N/A int *event_base_return,

1370N/A@@ -107,6 +110,9 @@ Bool XPanoramiXQueryExtension (

126N/A }

126N/A

126N/A

126N/A+#ifdef SUNSOFT

126N/A+static inline

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

126N/A Status XPanoramiXQueryVersion(

126N/A Display *dpy,

1072N/A int *major_version_return,

1370N/A@@ -137,6 +143,7 @@ Status XPanoramiXQueryVersion(

126N/A return 1;

126N/A }

126N/A

126N/A+#ifndef SUNSOFT

126N/A XPanoramiXInfo *XPanoramiXAllocInfo(void)

126N/A {

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

1370N/A@@ -232,6 +239,7 @@ Status XPanoramiXGetScreenSize (

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

126N/A return 1;

126N/A }

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

126N/A

126N/A /*******************************************************************\

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