fix compile errors/warnings -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * digest-doc.c: * make-path.c: `emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get config.h. * getopt.h: Conditionalize on HAVE_CONFIG_H to get real prototypes. src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * Makefile.in.in: * Makefile.in.in (objs): glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM. glyphs-widget.o should be too, but we need a bit of work ifdeffing out the subwindow stuff from redisplay.c et al. * bytecode.c (init_opcode_table_multi_op): Change var name to avoid shadowing with `basename'. * emacs.c (main_1): Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless HAVE_WINDOW_SYSTEM is defined. * linuxplay.c: * linuxplay.c (sighandler): * vdb-posix.c (vdb_fault_handler): Use const for variables holding string constants to avoid C++ warnings.

--- a/src/emacs.c	Fri Feb 26 15:52:24 2010 +0000
+++ b/src/emacs.c	Tue Mar 02 05:22:10 2010 -0600
@@ -1538,8 +1538,10 @@
       syms_of_frame ();
       syms_of_general ();
       syms_of_glyphs ();
+#ifdef HAVE_WINDOW_SYSTEM
       syms_of_glyphs_eimage ();
       syms_of_glyphs_shared ();
+#endif
       syms_of_glyphs_widget ();
       syms_of_gui ();
       syms_of_gutter ();
@@ -1873,7 +1875,9 @@
 	 called before the any calls to the other macros. */
 
       image_instantiator_format_create ();
+#ifdef HAVE_WINDOW_SYSTEM
       image_instantiator_format_create_glyphs_eimage ();
+#endif
       image_instantiator_format_create_glyphs_widget ();
 #ifdef HAVE_TTY
       image_instantiator_format_create_glyphs_tty ();
@@ -2104,7 +2108,9 @@
       vars_of_frame ();
       vars_of_gc ();
       vars_of_glyphs ();
+#ifdef HAVE_WINDOW_SYSTEM
       vars_of_glyphs_eimage ();
+#endif
       vars_of_glyphs_widget ();
       vars_of_gui ();
       vars_of_gutter ();