Changeset 21398 for trunk/src/msvcrt/environ.c

Timestamp:

Jul 28, 2010, 8:14:30 PM (15 years ago)

Author:

dmik

Message:

Build minivcrt.lib (accessible through minivcrt.h) that aims at providing MSVCRT-specific functions such as the wide character version of _getcwd() and similar to other runtimes.

File:

• trunk/src/msvcrt/environ.c (modified) (7 diffs)

trunk/src/msvcrt/environ.c

@@ -26 +26 @@
 #endif
 
+#ifndef __MINIVCRT__
+
 #include "wine/unicode.h"
 #include "msvcrt.h"
@@ -32 +34 @@
 #include "msvcrt/stdlib.h"
 
-
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+
+#else /* !__MINIVCRT__ */
+
+#include "minivcrt.h"
+#include "minivcrt_internal.h"
+
+#include "winternl.h"
+#include "wine/unicode.h"
+
+#endif /* !__MINIVCRT__ */
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -67 +80 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wgetenv (MSVCRT.@)
@@ -97 +112 @@
   return NULL;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -130 +147 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wputenv (MSVCRT.@)
@@ -154 +173 @@
 
  ret = !SetEnvironmentVariableW(name, value[0] ? value : NULL);
+#ifndef __MINIVCRT__
  /* Update the __p__environ array only when already initialized */
  if (MSVCRT__environ)
@@ -159 +179 @@
  if (MSVCRT__wenviron)
    MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);
+#endif /* !__MINIVCRT__ */
  return ret;
 }