Move callbackFunction type declaration into the class to avoid a name clash with future code.

2012-03-31 16:12:17 +02:00
parent 6371cd4dea
commit 28b813df23
2 changed files with 3 additions and 3 deletions
@@ -29,7 +29,7 @@

 struct callback_info {
 	uint32				token;
-	CallbackFunction	callback;
+	RemoteHWInterface::CallbackFunction	callback;
 	void*				cookie;
 };

@@ -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);