[Orxonox-commit 321] r2947 - branches/netp2/src

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-05-01 22:24:27 +0200 (Fri, 01 May 2009)
New Revision: 2947

Modified:
   branches/netp2/src/OrxonoxConfig.h.in
Log:
applying change from trunk (r2946)


Modified: branches/netp2/src/OrxonoxConfig.h.in
===================================================================
--- branches/netp2/src/OrxonoxConfig.h.in	2009-05-01 20:20:02 UTC (rev 2946)
+++ branches/netp2/src/OrxonoxConfig.h.in	2009-05-01 20:24:27 UTC (rev 2947)
@@ -141,6 +141,15 @@
 
 
 /*---------------------------------
+ * Special Macros
+ *-------------------------------*/
+#define MACRO_CONCATENATE_AUX(a, b) a##b
+#define MACRO_CONCATENATE(a, b) MACRO_CONCATENATE_AUX(a, b)
+#define MACRO_QUOTEME_AUX(x) #x
+#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
+
+
+/*---------------------------------
  * Includes
  *-------------------------------*/
 /* Define the english written operators like and, or, xor


Property changes on: branches/netp2/src/OrxonoxConfig.h.in
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/buildsystem/src/OrxonoxConfig.h.in:1875-2277,2279-2401
/branches/buildsystem2/src/OrxonoxConfig.h.in:2507-2659
/branches/buildsystem3/src/OrxonoxConfig.h.in:2663-2709
/branches/ceguilua/src/OrxonoxConfig.h.in:1803-1809
/branches/core3/src/OrxonoxConfig.h.in:1573-1740
/branches/gcc43/src/OrxonoxConfig.h.in:1581
/branches/gui/src/OrxonoxConfig.h.in:1636-1724
/branches/input/src/OrxonoxConfig.h.in:1630-1637
/branches/lodfinal/src/OrxonoxConfig.h.in:2373-2412
/branches/miniprojects/src/OrxonoxConfig.h.in:2755-2825
/branches/network/src/OrxonoxConfig.h.in:2357
/branches/network64/src/OrxonoxConfig.h.in:2211-2356
/branches/objecthierarchy/src/OrxonoxConfig.h.in:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/OrxonoxConfig.h.in:2172-2480
/branches/overlay/src/OrxonoxConfig.h.in:2118-2386
/branches/physics/src/OrxonoxConfig.h.in:1913-2056,2108-2440
/branches/physics_merge/src/OrxonoxConfig.h.in:2437-2458
/branches/pickups/src/OrxonoxConfig.h.in:1927-2087,2128
/branches/pickups2/src/OrxonoxConfig.h.in:2108-2498
/branches/presentation/src/OrxonoxConfig.h.in:2370-2653,2655-2661
/branches/questsystem/src/OrxonoxConfig.h.in:1895-2089
/branches/questsystem2/src/OrxonoxConfig.h.in:2108-2260
/branches/script_trigger/src/OrxonoxConfig.h.in:1296-1954,1956
/branches/weapon/src/OrxonoxConfig.h.in:1926-2095
/branches/weapon2/src/OrxonoxConfig.h.in:2108-2489
/trunk/src/OrxonoxConfig.h.in:2946