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

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

*** 32,44 **** #include "jvm.h" #include "jni_util.h" #include "debug_util.h" ! #ifndef HEADLESS #include <X11/Intrinsic.h> ! #endif /* !HEADLESS */ /* The JVM instance: defined in awt_MToolkit.c */ extern JavaVM *jvm; --- 32,44 ---- #include "jvm.h" #include "jni_util.h" #include "debug_util.h" ! #if !defined(HEADLESS) && !defined(MACOSX) #include <X11/Intrinsic.h> ! #endif /* !HEADLESS && !MACOSX */ /* The JVM instance: defined in awt_MToolkit.c */ extern JavaVM *jvm;
*** 108,118 **** #define AWT_NOFLUSH_UNLOCK() AWT_NOFLUSH_UNLOCK_IMPL() #define AWT_WAIT(tm) AWT_WAIT_IMPL(tm) #define AWT_NOTIFY() AWT_NOTIFY_IMPL() #define AWT_NOTIFY_ALL() AWT_NOTIFY_ALL_IMPL() ! #ifndef HEADLESS extern Display *awt_display; /* awt_GraphicsEnv.c */ extern Boolean awt_ModLockIsShiftLock; /* XToolkit.c */ ! #endif /* !HEADLESS */ #endif /* ! _AWT_ */ --- 108,118 ---- #define AWT_NOFLUSH_UNLOCK() AWT_NOFLUSH_UNLOCK_IMPL() #define AWT_WAIT(tm) AWT_WAIT_IMPL(tm) #define AWT_NOTIFY() AWT_NOTIFY_IMPL() #define AWT_NOTIFY_ALL() AWT_NOTIFY_ALL_IMPL() ! #if !defined(HEADLESS) && !defined(MACOSX) extern Display *awt_display; /* awt_GraphicsEnv.c */ extern Boolean awt_ModLockIsShiftLock; /* XToolkit.c */ ! #endif /* !HEADLESS && !MACOSX */ #endif /* ! _AWT_ */