From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 27 Jun 2008 14:22:17 +0000 (+0000)
Subject: Fix previous change: keep the correct branch of a
X-Git-Tag: emacs-pretest-23.0.90~4434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6bf1bdb87570d9864ce9f6907c1be94d67c18a7;p=emacs.git

Fix previous change: keep the correct branch of a
removed #if.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 867b0fb1cbc..e2f0230329e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* s/usg5-4.h: Fix previous change: keep the correct branch of a
+	removed #if.
+
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
 	    Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 79cc10ac031..87f7f384ebe 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -171,8 +171,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SIGTYPE void
 
-#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
-#define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
+#define ORDINARY_LINK
+
+#define LIB_STANDARD
 
 /* there are no -lg libraries on this system, and no libPW */