comparison src/device-x.c @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents 0d4c9d0f6a8d fce43cb76a1c
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
51 51
52 #include "xintrinsicp.h" /* CoreP.h needs this */ 52 #include "xintrinsicp.h" /* CoreP.h needs this */
53 #include <X11/CoreP.h> /* Numerous places access the fields of 53 #include <X11/CoreP.h> /* Numerous places access the fields of
54 a core widget directly. We could 54 a core widget directly. We could
55 use XtGetValues(), but ... */ 55 use XtGetValues(), but ... */
56 #include "xgccache.h" 56 #include "gccache-x.h"
57 #include <X11/Shell.h> 57 #include <X11/Shell.h>
58 #include <X11/Xmu/Error.h> 58 #include <X11/Xmu/Error.h>
59 59
60 #if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D) 60 #if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
61 #include "sysdll.h" 61 #include "sysdll.h"