* m/intel386.h (NO_REMAP): Do no define for USG, not used.

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

diff --git a/src/s/sol2.h b/src/s/sol2.h
index aa30be3675cb6ddfc22c643844901cf3138828a8..bd6e1c9bdba56d7ddff405d69a2b78f20b962907 100644 (file)
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -31,6 +31,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    says where to find X windows at run time.  */
 #ifndef __GNUC__
 #define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
+/* eggert thinks all versions of SunPro C allowed this.  */
+#define C_DEBUG_SWITCH -g -O
 #else /* GCC */
 /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
    has anything in it.  It can be empty.
@@ -38,7 +40,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define LD_SWITCH_SYSTEM `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX`
 #endif /* GCC */
 
-#undef LIBS_SYSTEM
 #define LIBS_SYSTEM -lsocket -lnsl -lkstat
 
 /* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
@@ -48,11 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_LIBKSTAT
 #endif
 
-/* eggert thinks all versions of SunPro C allowed this.  */
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH -g -O
-#endif
-
 /* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
    XIM support.  */