diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:51:27 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:57:32 +0300 |
| commit | 28721aae7257d6f9d70aeb6c6dc86f9004926004 (patch) | |
| tree | a6623be7f93be03c430739eeb46ae17f9e827b40 /src/Native/Runtime/PalRedhawkFunctions.h | |
| parent | d7be9c48bb4e7ba780efd90d320c010f1b25694a (diff) | |
| parent | 4efd23fdc3571099ac64322253f01dd3dd40cbc2 (diff) | |
Merge remote-tracking branch 'upstream/nmirror' into nmirror-merge
Conflicts:
src/Native/Runtime/PalRedhawkFunctions.h
src/Native/Runtime/RhConfig.cpp
src/Native/Runtime/RhConfig.h
src/Native/Runtime/gcrhenv.cpp
src/Native/gc/env/gcenv.base.h
Diffstat (limited to 'src/Native/Runtime/PalRedhawkFunctions.h')
| -rw-r--r-- | src/Native/Runtime/PalRedhawkFunctions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Native/Runtime/PalRedhawkFunctions.h b/src/Native/Runtime/PalRedhawkFunctions.h index 2da38028f..204809639 100644 --- a/src/Native/Runtime/PalRedhawkFunctions.h +++ b/src/Native/Runtime/PalRedhawkFunctions.h @@ -93,14 +93,14 @@ inline UInt32 PalGetCurrentThreadId() } #ifdef UNICODE -extern "C" UInt32 __stdcall GetEnvironmentVariableW(LPCWSTR, LPWSTR, UInt32); -inline UInt32 PalGetEnvironmentVariable(LPCWSTR arg1, LPWSTR arg2, UInt32 arg3) +extern "C" UInt32 __stdcall GetEnvironmentVariableW(__in_z_opt LPCWSTR, __out_z_opt LPWSTR, UInt32); +inline UInt32 PalGetEnvironmentVariable(__in_z_opt LPCWSTR arg1, __out_z_opt LPWSTR arg2, UInt32 arg3) { return GetEnvironmentVariableW(arg1, arg2, arg3); } #else -extern "C" UInt32 __stdcall GetEnvironmentVariableA(LPCSTR, LPSTR, UInt32); -inline UInt32 PalGetEnvironmentVariable(LPCSTR arg1, LPSTR arg2, UInt32 arg3) +extern "C" UInt32 __stdcall GetEnvironmentVariableA(__in_z_opt LPCSTR, __out_z_opt LPSTR, UInt32); +inline UInt32 PalGetEnvironmentVariable(__in_z_opt LPCSTR arg1, __out_z_opt LPSTR arg2, UInt32 arg3) { return GetEnvironmentVariableA(arg1, arg2, arg3); } |