src/solaris/native/sun/awt/img_util_md.h

rev 9924 : 8003900: X11 dependencies should be removed from Mac OS X build.
Reviewed-by:
Contributed-by: David DeHaven <david.dehaven@oracle.com>

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 23,33 ****
   * questions.
   */
  
  #include "color.h"
  
! #ifndef HEADLESS
  typedef struct {
      ImgConvertData cvdata;      /* The data needed by ImgConvertFcn's */
      struct Hsun_awt_image_ImageRepresentation *hJavaObject;     /* backptr */
      XID pixmap;                 /* The X11 pixmap containing the image */
      XID mask;                   /* The X11 pixmap with the transparency mask */
--- 23,33 ----
   * questions.
   */
  
  #include "color.h"
  
! #if !defined(HEADLESS) && !defined(MACOSX)
  typedef struct {
      ImgConvertData cvdata;      /* The data needed by ImgConvertFcn's */
      struct Hsun_awt_image_ImageRepresentation *hJavaObject;     /* backptr */
      XID pixmap;                 /* The X11 pixmap containing the image */
      XID mask;                   /* The X11 pixmap with the transparency mask */
*** 66,76 ****
  #define ScanBytes(cvdata)       (((IRData *)cvdata)->xim->bytes_per_line)
  
  #define MaskScan(cvdata)                                        \
          ((((IRData *)cvdata)->maskim->bytes_per_line) >> 2)
  
! #endif /* !HEADLESS */
  
  #define MaskOffset(x)           ((x) >> 5)
  
  #define MaskInit(x)             (1U << (31 - ((x) & 31)))
  
--- 66,76 ----
  #define ScanBytes(cvdata)       (((IRData *)cvdata)->xim->bytes_per_line)
  
  #define MaskScan(cvdata)                                        \
          ((((IRData *)cvdata)->maskim->bytes_per_line) >> 2)
  
! #endif /* !HEADLESS && !MACOSX */
  
  #define MaskOffset(x)           ((x) >> 5)
  
  #define MaskInit(x)             (1U << (31 - ((x) & 31)))