X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=879377a1cc0928bae14c6fd92c5fd8f032eacac2;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=f4cee071af9b048d9aa9aebad6ed7de7b9a95cd7;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git

diff --git a/lily/relocate.cc b/lily/relocate.cc
index f4cee071af..879377a1cc 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,6 +39,10 @@
 #include "version.hh"
 #include "warn.hh"
 
+#ifdef __MINGW32__
+#include <winbase.h>
+#endif
+
 #define FRAMEWORKDIR ".."
 
 int
@@ -103,10 +107,6 @@ prepend_env_path (char const *key, string value)
   return -1;
 }
 
-#ifdef __MINGW32__
-#include <winbase.h>
-#endif
-
 static void
 prefix_relocation (const string &prefix)
 {
@@ -181,7 +181,9 @@ setup_paths (char const *argv0_ptr)
         {
           /* Find absolute ARGV0 name, using PATH.  */
           File_path path;
-          path.parse_path (getenv ("PATH"));
+          char *p = getenv ("PATH");
+          if (p)
+            path.parse_path (p);
 
 #ifndef __MINGW32__
           argv0_abs = path.find (argv0_filename.to_string ());