sun-abi.patch revision 126
126N/A#
126N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
126N/A#
126N/A# Permission is hereby granted, free of charge, to any person obtaining a
126N/A# copy of this software and associated documentation files (the
126N/A# "Software"), to deal in the Software without restriction, including
126N/A# without limitation the rights to use, copy, modify, merge, publish,
126N/A# distribute, and/or sell copies of the Software, and to permit persons
126N/A# to whom the Software is furnished to do so, provided that the above
126N/A# copyright notice(s) and this permission notice appear in all copies of
126N/A# the Software and that both the above copyright notice(s) and this
126N/A# permission notice appear in supporting documentation.
126N/A#
126N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
126N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
126N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
126N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
126N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
126N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
126N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
126N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
126N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
126N/A#
126N/A# Except as contained in this notice, the name of a copyright holder
126N/A# shall not be used in advertising or otherwise to promote the sale, use
126N/A# or other dealings in this Software without prior written authorization
126N/A# of the copyright holder.
126N/A#
126N/A#
126N/A# ident "@(#)sun-abi.patch 1.2 07/03/15 SMI"
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
126N/A--- src/Xinerama.c 2007-03-01 15:41:16.000000000 -0800
126N/A+++ src/Xinerama.c 2007-03-07 14:50:49.899520000 -0800
126N/A@@ -76,6 +76,9 @@
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,
126N/A int *event_basep,
126N/A@@ -94,6 +97,9 @@
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,
126N/A int *major_versionp,
126N/A@@ -124,6 +130,7 @@
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));
126N/A@@ -219,6 +226,7 @@
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,