From df4e15383756eea51177ce690e897d70ae34d644 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 21 Nov 2012 15:03:07 +0000
Subject: [PATCH] Accidentally conflated two identically named fields.
---
src/net/sf/briar/lifecycle/WindowsShutdownManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/net/sf/briar/lifecycle/WindowsShutdownManagerImpl.java b/src/net/sf/briar/lifecycle/WindowsShutdownManagerImpl.java
index d603975fe1..677744832e 100644
--- a/src/net/sf/briar/lifecycle/WindowsShutdownManagerImpl.java
+++ b/src/net/sf/briar/lifecycle/WindowsShutdownManagerImpl.java
@@ -2,7 +2,6 @@ package net.sf.briar.lifecycle;
import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER;
import static com.sun.jna.Library.OPTION_TYPE_MAPPER;
-import static com.sun.jna.win32.W32APIFunctionMapper.UNICODE;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -25,6 +24,8 @@ import com.sun.jna.platform.win32.WinDef.WPARAM;
import com.sun.jna.platform.win32.WinUser.MSG;
import com.sun.jna.win32.StdCallLibrary;
import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
+import com.sun.jna.win32.W32APIFunctionMapper;
+import com.sun.jna.win32.W32APITypeMapper;
class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
@@ -42,8 +43,8 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
WindowsShutdownManagerImpl() {
// Use the Unicode versions of Win32 API calls
Map<String, Object> m = new HashMap<String, Object>();
- m.put(OPTION_TYPE_MAPPER, UNICODE);
- m.put(OPTION_FUNCTION_MAPPER, UNICODE);
+ m.put(OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
+ m.put(OPTION_FUNCTION_MAPPER, W32APIFunctionMapper.UNICODE);
options = Collections.unmodifiableMap(m);
}
--
GitLab