(iswitchb-visit-buffer): Use `select-frame-set-input-focus'.

[gnu-emacs] / src / s / netbsd.h

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 1a134f37443b0281414082a9dade8cbc761d703d..354ace7e9a04f67797bd49b63a090777b0b3fd50 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -76,7 +76,16 @@
 /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
    says where to find X windows at run time.  We convert it to a -rpath option
    which is what OSF1 uses.  */
-#define LD_SWITCH_SYSTEM `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -L/usr/pkg/lib -L/usr/local/lib
+
+/* The following is needed to make `configure' find Xpm, Xaw3d and
+   image include and library files if using /usr/bin/gcc.  That
+   compiler seems to be modified to not find headers in
+   /usr/local/include or libs in /usr/local/lib by default.  */
+
+#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
+
 #endif /* __ELF__ */
 
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
@@ -94,7 +103,7 @@
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */
 
-#ifndef NO_C_SOURCE
+#ifndef NOT_C_CODE
 #include <signal.h>
 #endif
 
@@ -112,5 +121,5 @@
  
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
 
-#define GC_MARK_STACK  1
+#define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS