compilation fix after incorrectly resolved conflict

[wxWidgets.git] / include / wx / version.h

diff --git a/include/wx/version.h b/include/wx/version.h
index 9e1a8e5728bb51d08dd40e7d5367b9ca83518af7..66db0313116037625cee554fffafd72f10228074 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -9,17 +9,17 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __VERSIONH__
-#define __VERSIONH__
+#ifndef _WX_VERSIONH__
+#define _WX_VERSIONH__
 
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
-#define wxMINOR_VERSION    0
-#define wxRELEASE_NUMBER   0
-#define wxVERSION_STRING "wxWindows 2.0"
+#define wxMINOR_VERSION    1
+#define wxRELEASE_NUMBER   12
+#define wxVERSION_STRING "wxWindows 2.1.12"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      12
-#define wxVERSION_FLOAT float(wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0))
+#define wxBETA_NUMBER      0
+#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
-       // __VERSIONH__
+// _WX_VERSIONH__