Changeset 503 for trunk/src/gmake/w32/pathstuff.c

Timestamp:

Sep 15, 2006, 7:09:38 AM (19 years ago)

Author:

bird

Message:

Untested merge with GNU Make v3.81 (vendor/gnumake/2005-05-16 -> vendor/gnumake/current).

File:

• trunk/src/gmake/w32/pathstuff.c (modified) (2 diffs)

trunk/src/gmake/w32/pathstuff.c

@@ -1 @@
-#include <windows.h>
+/* Path conversion for Windows pathnames.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
+This file is part of GNU Make.
+
+GNU Make is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2, or (at your option) any later version.
+
+GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GNU Make; see the file COPYING.  If not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+
+#include <Windows.h>
 #include <string.h>
 #include <stdlib.h>
@@ -206 +223 @@
 getcwd_fs(char* buf, int len)
 {
-        char *p;
-
-        if (p = getcwd(buf, len)) {
+        char *p = getcwd(buf, len);
+
+        if (p) {
                 char *q = w32ify(buf, 0);
                 strncpy(buf, q, len);