/* Deal with the X Resource Manager.
- Copyright (C) 1990, 1993, 1994 Free Software Foundation.
+ Copyright (C) 1990, 1993, 1994, 2000, 2001 Free Software Foundation.
This file is part of GNU Emacs.
#include <stdio.h>
#if 1 /* I'd really appreciate it if this code could go away... -JimB */
-/* this avoids lossage in the `dual-universe' headers on AT&T SysV X11 */
-#ifdef USG5
+/* This avoids lossage in the `dual-universe' headers on AT&T SysV
+ X11. Don't do it on Solaris, because it breaks compilation with
+ XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris
+ 2 */
+#if defined(USG5) && !defined(SOLARIS2)
#ifndef SYSV
#define SYSV
#endif
-#endif /* USG5 */
+#endif /* USG5 && !SOLARIS2 */
#endif /* 1 */
XrmPutLineResource (&rdb, line);
sprintf (line, "%s*menu*background: grey75", myclass);
XrmPutLineResource (&rdb, line);
- sprintf (line, "%s*menubar*background: grey75", myclass, helv);
+ sprintf (line, "%s*menubar*background: grey75", myclass);
XrmPutLineResource (&rdb, line);
sprintf (line, "%s*verticalScrollBar.background: grey75", myclass);
XrmPutLineResource (&rdb, line);