anjuta r4125 - in trunk: . libanjuta

[naba svn gnome org]

Author: naba
Date: Thu Aug  7 18:29:56 2008
New Revision: 4125
URL: http://svn.gnome.org/viewvc/anjuta?rev=4125&view=rev

Log:
	* libanjuta/anjuta-version.h.in: Rename ANJUTA_*_VERSION
	to LIBANJUTA_*_VERSION and ANJUTA_VERSION* to LIBANJUTA_VERSION*
	to avoid conflict with ones defined in config.h



Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-version.h.in

Modified: trunk/libanjuta/anjuta-version.h.in
==============================================================================
--- trunk/libanjuta/anjuta-version.h.in	(original)
+++ trunk/libanjuta/anjuta-version.h.in	Thu Aug  7 18:29:56 2008
@@ -17,8 +17,8 @@
  * 
  */
 
-#ifndef _ANJUTA_VERSION_H_
-#define _ANJUTA_VERSION_H_
+#ifndef _LIBANJUTA_VERSION_H_
+#define _LIBANJUTA_VERSION_H_
 
 /**
  * SECTION:anjuta-version
@@ -29,50 +29,50 @@
  */
 
 /**
- * ANJUTA_MAJOR_VERSION:
+ * LIBANJUTA_MAJOR_VERSION:
  *
- * Anjuta major version component (e.g. 1 if %ANJUTA_VERSION is 1.2.3)
+ * Anjuta major version component (e.g. 1 if %LIBANJUTA_VERSION is 1.2.3)
  */
-#define ANJUTA_MAJOR_VERSION			(@ANJUTA_MAJOR_VERSION@)
+#define LIBANJUTA_MAJOR_VERSION			(@LIBANJUTA_MAJOR_VERSION@)
 
 /**
- * ANJUTA_MINOR_VERSION:
+ * LIBANJUTA_MINOR_VERSION:
  *
- * Anjuta minor version component (e.g. 2 if %ANJUTA_VERSION is 1.2.3)
+ * Anjuta minor version component (e.g. 2 if %LIBANJUTA_VERSION is 1.2.3)
  */
-#define ANJUTA_MINOR_VERSION			(@ANJUTA_MINOR_VERSION@)
+#define LIBANJUTA_MINOR_VERSION			(@LIBANJUTA_MINOR_VERSION@)
 
 /**
- * ANJUTA_MICRO_VERSION:
+ * LIBANJUTA_MICRO_VERSION:
  *
- * Anjuta micro version component (e.g. 3 if %ANJUTA_VERSION is 1.2.3)
+ * Anjuta micro version component (e.g. 3 if %LIBANJUTA_VERSION is 1.2.3)
  */
-#define ANJUTA_MICRO_VERSION			(@ANJUTA_MICRO_VERSION@)
+#define LIBANJUTA_MICRO_VERSION			(@LIBANJUTA_MICRO_VERSION@)
 
 /**
- * ANJUTA_VERSION
+ * LIBANJUTA_VERSION
  *
  * Anjuta version.
  */
-#define ANJUTA_VERSION					(@ANJUTA_VERSION@)
+#define LIBANJUTA_VERSION					(@LIBANJUTA_VERSION@)
 
 /**
- * ANJUTA_VERSION_S:
+ * LIBANJUTA_VERSION_S:
  *
  * Anjuta version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define ANJUTA_VERSION_S				"@ANJUTA_VERSION@"
+#define LIBANJUTA_VERSION_S				"@LIBANJUTA_VERSION@"
 
 /**
- * ANJUTA_VERSION_HEX:
+ * LIBANJUTA_VERSION_HEX:
  *
  * Anjuta version, encoded as an hexadecimal number, useful for
  * integer comparisons.
  */
-#define ANJUTA_VERSION_HEX				(ANJUTA_MAJOR_VERSION << 24 | \
-										 ANJUTA_MINOR_VERSION << 16 | \
-										 ANJUTA_MICRO_VERSION << 8)
+#define LIBANJUTA_VERSION_HEX				(LIBANJUTA_MAJOR_VERSION << 24 | \
+										 LIBANJUTA_MINOR_VERSION << 16 | \
+										 LIBANJUTA_MICRO_VERSION << 8)
 
 /**
  * ANJUTA_CHECK_VERSION:
@@ -84,9 +84,10 @@
  * of Anjuta is greater than the required one.
  */
 #define ANJUTA_CHECK_VERSION(major,minor,micro)		\
-		(ANJUTA_MAJOR_VERSION > (major) || 										\
-		(ANJUTA_MAJOR_VERSION == (major) && ANJUTA_MINOR_VERSION > (minor)) ||	\
-		(ANJUTA_MAJOR_VERSION == (major) && ANJUTA_MINOR_VERSION == (minor) &&	\
-		 ANJUTA_MICRO_VERSION >= (micro)))
+		(LIBANJUTA_MAJOR_VERSION > (major) || 										\
+		(LIBANJUTA_MAJOR_VERSION == (major) && LIBANJUTA_MINOR_VERSION > (minor)) ||	\
+		(LIBANJUTA_MAJOR_VERSION == (major) && LIBANJUTA_MINOR_VERSION == (minor) &&	\
+		 LIBANJUTA_MICRO_VERSION >= (micro)))
+
+#endif /* _LIBANJUTA_VERSION_H_ */
 
-#endif /* _ANJUTA_VERSION_H_ */