X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=8f4a849a7740bc3363899d48d5e7531982e8dbce;hb=f5944176b5a027ad5d7922429f0045f797b0b727;hp=bf96ecb57d014ee6068de798094643ba5d2cefa6;hpb=b81657391042e045769c544cf749f2f382d6e9a5;p=bertos.git

diff --git a/compiler.h b/compiler.h
index bf96ecb5..8f4a849a 100755
--- a/compiler.h
+++ b/compiler.h
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2001,2002,2003 Bernardo Innocenti <bernie@codewiz.org>
- * All Rights Reserved.
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \version $Id$
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * Revision 1.3  2004/06/06 18:00:39  bernie
+ * PP_CAT(): New macro.
+ *
+ * Revision 1.2  2004/06/03 11:27:09  bernie
+ * Add dual-license information.
+ *
  * Revision 1.1  2004/05/23 17:48:35  bernie
  * Add top-level files.
  *
@@ -238,6 +244,10 @@
 #define UINT32_LOG2(x) \
 	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
 
+/*! Concatenate two different preprocessor tokens (allowing macros to expand) */
+#define PP_CAT(x,y)                       PP_CAT__(x,y)
+#define PP_CAT__(x,y)                     x ## y
+
 /* Type definitions - should go in <sys/types.h> */
 #if !(defined(size_t) || defined(_SIZE_T_DEFINED))
 	#define size_t unsigned int