From 856f604fd0cffa212b06cabfb7a5324c8e4d5460 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 20 Apr 2013 16:23:24 +0000
Subject: name conflict resolution

git-svn-id: http://svn.miranda-ng.org/main/trunk@4485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExternalAPI/m_userinfoex.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/ExternalAPI')

diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h
index 2bcd7ec9e2..76be0cd8d3 100644
--- a/plugins/ExternalAPI/m_userinfoex.h
+++ b/plugins/ExternalAPI/m_userinfoex.h
@@ -251,14 +251,14 @@ lParam = not used
 // button styles
 #define MBS_DEFBUTTON		0x00001000L			// default button
 #define MBS_PUSHBUTTON		0x00002000L			// toggle button
-#define MBS_FLAT			0x00004000L			// flat button
+#define MBS_FLAT           0x00004000L			// flat button
 #define MBS_DOWNARROW		0x00008000L			// has arrow on the right
 
-#define MBF_UNICODE			1
+#define MBBF_UNICODE			1
 #ifdef _UNICODE
- #define MBF_TCHAR			MBF_UNICODE
+ #define MBBF_TCHAR			MBBF_UNICODE
 #else
- #define MBF_TCHAR			0
+ #define MBBF_TCHAR			0
 #endif
 
 // BUTTONADDTOOLTIP
-- 
cgit v1.2.3