components/x11/libXinerama/patches/sun-abi.patch

   1 #
   2 # Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 # Permission is hereby granted, free of charge, to any person obtaining a
   5 # copy of this software and associated documentation files (the "Software"),
   6 # to deal in the Software without restriction, including without limitation
   7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8 # and/or sell copies of the Software, and to permit persons to whom the
   9 # Software is furnished to do so, subject to the following conditions:
  10 #
  11 # The above copyright notice and this permission notice (including the next
  12 # paragraph) shall be included in all copies or substantial portions of the
  13 # Software.
  14 #
  15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21 # DEALINGS IN THE SOFTWARE.
  22 #
  23 #
  24 #
  25
  26 Solaris already has the old XPanoramiX* API in libXext, so we don't export
  27 it from libXinerama to avoid symbol clashes.
  28
  29 diff --git a/src/Xinerama.c b/src/Xinerama.c
  30 index 67a35b5..e0e5c5d 100644
  31 --- a/src/Xinerama.c
  32 +++ b/src/Xinerama.c
  33 @@ -89,6 +89,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, panoramiX_ext_info)
  34   *                                                                          *
  35   ****************************************************************************/
  36
  37 +#ifdef SUNSOFT
  38 +static inline
  39 +#endif /* SUNSOFT */
  40  Bool XPanoramiXQueryExtension (
  41      Display *dpy,
  42      int *event_base_return,
  43 @@ -107,6 +110,9 @@ Bool XPanoramiXQueryExtension (
  44  }
  45
  46
  47 +#ifdef SUNSOFT
  48 +static inline
  49 +#endif /* SUNSOFT */
  50  Status XPanoramiXQueryVersion(
  51      Display *dpy,
  52      int     *major_version_return,
  53 @@ -137,6 +143,7 @@ Status XPanoramiXQueryVersion(
  54      return 1;
  55  }
  56
  57 +#ifndef SUNSOFT
  58  XPanoramiXInfo *XPanoramiXAllocInfo(void)
  59  {
  60         return (XPanoramiXInfo *) Xmalloc (sizeof (XPanoramiXInfo));
  61 @@ -232,6 +239,7 @@ Status XPanoramiXGetScreenSize (
  62      panoramiX_info->height = rep.height;
  63      return 1;
  64  }
  65 +#endif /* SUNSOFT */
  66
  67  /*******************************************************************\
  68    Alternate interface to make up for shortcomings in the original,