[Bf-blender-cvs] [ae6a5629a5f] master: Fix build error on windows

Germano Cavalcante noreply at git.blender.org
Fri Mar 6 16:49:55 CET 2020


Commit: ae6a5629a5fa83286bb56dccc7bc7f10e53810c8
Author: Germano Cavalcante
Date:   Fri Mar 6 12:49:15 2020 -0300
Branches: master
https://developer.blender.org/rBae6a5629a5fa83286bb56dccc7bc7f10e53810c8

Fix build error on windows

```
Error	C4013	'_VA_ELEM1' undefined; assuming extern returning int
```

===================================================================

M	source/blender/blenlib/intern/path_util.c

===================================================================

diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 688dc9fd729..4a1f2ac2a8f 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -478,7 +478,7 @@ static void BLI_path_unc_to_short(wchar_t *unc)
    *    \\?\C:\ to C:\ and \\?\C:\folder\... to C:\folder\...
    */
   if ((len > 3) && (unc[0] == L'\\') && (unc[1] == L'\\') && (unc[2] == L'?') &&
-      ELEM((unc[3], L'\\', L'/'))) {
+      ELEM(unc[3], L'\\', L'/')) {
     if ((len > 5) && (unc[5] == L':')) {
       wcsncpy(tmp, unc + 4, len - 4);
       tmp[len - 4] = L'\0';



More information about the Bf-blender-cvs mailing list