From 03a59e7f787a160c6cc07c7a37df64a793242ef2 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon, 17 Jun 2013 02:01:39 +0100
Subject: [PATCH] hw/xwin: Add remaining clipboard globals to winglobals.h

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
---
 hw/xwin/windialogs.c | 7 -------
 hw/xwin/winglobals.h | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index c9af0e203..61f7fe0bd 100644
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -36,13 +36,6 @@
 #include <shellapi.h>
 #include "winprefs.h"
 
-/*
- * References to external globals
- */
-
-#ifdef XWIN_CLIPBOARD
-extern Bool g_fClipboardStarted;
-#endif
 /*
  * Local function prototypes
  */
diff --git a/hw/xwin/winglobals.h b/hw/xwin/winglobals.h
index 5d8e7a075..d7b813dbb 100644
--- a/hw/xwin/winglobals.h
+++ b/hw/xwin/winglobals.h
@@ -73,6 +73,9 @@ typedef int (*winDispatchProcPtr) (ClientPtr);
  */
 extern winDispatchProcPtr winProcEstablishConnectionOrig;
 #endif
+extern Bool g_fUnicodeClipboard;
+extern Bool g_fClipboard;
+extern Bool g_fClipboardStarted;
 
 /* The global X default icons */
 #if defined(XWIN_MULTIWINDOW)