Commit 57faf3fa authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

contrib: gpg-error: fix UNICODE usage

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 25aec055
......@@ -17,6 +17,7 @@ endif
endif
$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
$(APPLY) $(SRC)/gpg-error/no-executable.patch
$(APPLY) $(SRC)/gpg-error/win32-unicode.patch
$(MOVE)
cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
ifdef HAVE_TIZEN
......
--- libgpg-error/src/estream.c 2016-05-24 11:21:10.180251700 +0200
+++ libgpg-error/src/estream.c.msvc 2016-05-24 11:23:18.195880200 +0200
@@ -4115,7 +4115,7 @@ tmpfd (void)
{
#ifdef HAVE_W32_SYSTEM
int attempts, n;
-#ifdef HAVE_W32CE_SYSTEM
+#if defined(HAVE_W32CE_SYSTEM) || defined(UNICODE)
wchar_t buffer[MAX_PATH+9+12+1];
# define mystrlen(a) wcslen (a)
wchar_t *name, *p;
@@ -4136,7 +4136,7 @@ tmpfd (void)
return -1;
}
p = buffer + mystrlen (buffer);
-#ifdef HAVE_W32CE_SYSTEM
+#if defined(HAVE_W32CE_SYSTEM) || defined(UNICODE)
wcscpy (p, L"_estream");
#else
strcpy (p, "_estream");
@@ -4157,7 +4157,7 @@ tmpfd (void)
*p++ = tohex (((value >> 28) & 0x0f));
value <<= 4;
}
-#ifdef HAVE_W32CE_SYSTEM
+#if defined(HAVE_W32CE_SYSTEM) || defined(UNICODE)
wcscpy (p, L".tmp");
#else
strcpy (p, ".tmp");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment