From 28b813df23ce0d5873dcf07a615685dfeae6b8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 31 Mar 2012 16:10:35 +0200
Subject: [PATCH] Move callbackFunction type declaration into the class to
 avoid a name clash with future code.

---
 src/servers/app/drawing/remote/RemoteHWInterface.cpp | 2 +-
 src/servers/app/drawing/remote/RemoteHWInterface.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/servers/app/drawing/remote/RemoteHWInterface.cpp b/src/servers/app/drawing/remote/RemoteHWInterface.cpp
index d14eabec87..0084fa4f0f 100644
--- a/src/servers/app/drawing/remote/RemoteHWInterface.cpp
+++ b/src/servers/app/drawing/remote/RemoteHWInterface.cpp
@@ -29,7 +29,7 @@
 
 struct callback_info {
 	uint32				token;
-	CallbackFunction	callback;
+	RemoteHWInterface::CallbackFunction	callback;
 	void*				cookie;
 };
 
diff --git a/src/servers/app/drawing/remote/RemoteHWInterface.h b/src/servers/app/drawing/remote/RemoteHWInterface.h
index c196ecbc1f..03fcad6d4b 100644
--- a/src/servers/app/drawing/remote/RemoteHWInterface.h
+++ b/src/servers/app/drawing/remote/RemoteHWInterface.h
@@ -22,8 +22,6 @@ class RemoteMessage;
 
 struct callback_info;
 
-typedef bool (*CallbackFunction)(void* cookie, RemoteMessage& message);
-
 
 class RemoteHWInterface : public HWInterface {
 public:
@@ -81,6 +79,8 @@ virtual	status_t					CopyBackToFront(const BRect& frame);
 		StreamingRingBuffer*		ReceiveBuffer() { return fReceiveBuffer; }
 		StreamingRingBuffer*		SendBuffer() { return fSendBuffer; }
 
+typedef bool (*CallbackFunction)(void* cookie, RemoteMessage& message);
+
 		status_t					AddCallback(uint32 token,
 										CallbackFunction callback,
 										void* cookie);