From 44c57bb9d824806bf3ce68c9217e0833be9d2eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <kuemmel@lyx.org>
Date: Sat, 2 Apr 2016 10:59:19 +0200
Subject: [PATCH] msvc2015: _wgetmainargs is not available ony more

---
 src/support/os_win32.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index c50fa05b1a..292555d6c7 100644
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -60,11 +60,13 @@
 #include <stdio.h>
 #endif
 
-
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#else
 extern "C" {
 extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
 			   int expand_wildcards, int * new_mode);
 }
+#endif
 
 using namespace std;
 
@@ -157,9 +159,13 @@ void init(int argc, char * argv[])
 
 
 	// Get the wide program arguments array
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+	argv_ = CommandLineToArgvW(GetCommandLineW(), &argc_);
+#else
 	wchar_t ** envp = 0;
 	int newmode = 0;
 	__wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+#endif
 	LATTEST(argc == argc_);
 
 	// If Cygwin is detected, query the cygdrive prefix.