From 921242c6f478be3c024935587877f9b6602b1c19 Mon Sep 17 00:00:00 2001 From: Jan D Date: Mon, 16 Aug 2010 10:03:27 +0200 Subject: [PATCH] nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863). --- src/ChangeLog | 3 +++ src/nsselect.m | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 901adadda06..3feeb5c9a72 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-08-16 Jan Djärv + * nsselect.m: include keyboard.h for QPRIMARY, remove its + declaration (Bug#6863). + * xselect.c: Remove declaration of QPRIMARY (Bug#6864). * keyboard.h (QPRIMARY): Declare (Bug#6864). diff --git a/src/nsselect.m b/src/nsselect.m index 23dede9c38e..fb1998a9799 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -33,10 +33,11 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) #include "lisp.h" #include "nsterm.h" #include "termhooks.h" +#include "keyboard.h" #define CUT_BUFFER_SUPPORT -Lisp_Object QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME; +Lisp_Object QSECONDARY, QTEXT, QFILE_NAME; static Lisp_Object Vns_sent_selection_hooks; static Lisp_Object Vns_lost_selection_hooks; -- 2.11.4.GIT