Fix PUGIXML_VERSION macro

Also make sure the line shows up in grep when using the current version
number.

Fixes #478.

src/pugixml.hpp

@@ -11,10 +11,10 @@
  * Copyright (C) 2003, by Kristen Wegner ([email protected])
  */
 
-#ifndef PUGIXML_VERSION
 // Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
 // Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
-# define PUGIXML_VERSION 1110
+#ifndef PUGIXML_VERSION
+# define PUGIXML_VERSION 1120 // 1.12
 #endif
 
 // Include user configuration file (this can define various configuration macros)

tests/test_version.cpp

@@ -1,5 +1,5 @@
 #include "../src/pugixml.hpp"
 
-#if PUGIXML_VERSION != 1110
+#if PUGIXML_VERSION != 1120
 #error Unexpected pugixml version
 #endif