From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Eric Hanchrow Newsgroups: gmane.emacs.devel Subject: Fix to fileio.c to un-break W32 build Date: Tue, 04 May 2004 11:32:08 -0700 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <87ad0orql3.fsf@offby1.atm01.sea.blarg.net> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1083695780 16286 80.91.224.253 (4 May 2004 18:36:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 4 May 2004 18:36:20 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue May 04 20:36:11 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BL4m2-00056d-00 for ; Tue, 04 May 2004 20:36:10 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BL4m2-0007GB-00 for ; Tue, 04 May 2004 20:36:10 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BL4lK-0006Qz-1X for emacs-devel@quimby.gnus.org; Tue, 04 May 2004 14:35:26 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BL4kW-0006Mz-KB for emacs-devel@gnu.org; Tue, 04 May 2004 14:34:36 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BL4jy-0005up-ME for emacs-devel@gnu.org; Tue, 04 May 2004 14:34:34 -0400 Original-Received: from [80.91.224.249] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BL4iB-0004pO-DP for emacs-devel@gnu.org; Tue, 04 May 2004 14:32:11 -0400 Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1BL4iA-0006C2-00 for ; Tue, 04 May 2004 20:32:11 +0200 Original-Received: from offby1.atm01.sea.blarg.net ([206.124.138.125]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 May 2004 20:32:10 +0200 Original-Received: from offby1 by offby1.atm01.sea.blarg.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 May 2004 20:32:10 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 28 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: offby1.atm01.sea.blarg.net User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) Cancel-Lock: sha1:w7mFIyQsZeq78Q0LOEEssKCtDPk= X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:22728 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:22728 Building in Windows using MinGW suddenly broke -- Frename_file in fileio.c calls the function Fmake_symbolic_link, but that function isn't defined on Windows. I think the right thing to do is simply wrap the call in an `ifdef' like this, just as the definition of Fmake_symbolic_link is: diff -bu "d:/cygwin/usr/local/src/emacs-cvs/src/fileio.c.~1.502.~" "d:/cygwin/usr/local/src/emacs-cvs/src/fileio.c" --- d:/cygwin/usr/local/src/emacs-cvs/src/fileio.c.~1.502.~ 2004-05-04 11:18:24.049931500 -0700 +++ d:/cygwin/usr/local/src/emacs-cvs/src/fileio.c 2004-05-04 11:23:51.206030700 -0700 @@ -2731,9 +2731,11 @@ /* We have already prompted if it was an integer, so don't have copy-file prompt again. */ NILP (ok_if_already_exists) ? Qnil : Qt, Qt); +#ifdef S_IFLNK else Fmake_symbolic_link (symlink_target, newname, NILP (ok_if_already_exists) ? Qnil : Qt, Qt); +#endif Fdelete_file (file); } else Diff finished. Tue May 04 11:30:00 2004 -- Adelle Davis used to say that she never saw anyone get cancer who drank a quart of milk daily, as she did. She stopped saying that when she died of cancer in 1974.