[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freetype-devel
Subject:    [Devel] OTV_NEST*
From:       Masatake YAMATO <jet () gyve ! org>
Date:       2004-12-26 12:05:17
Message-ID: 20041226.210517.200274134.jet () gyve ! org
[Download RAW message or body]

I'm reading otvalid.
I've found some strange macro usages. I guess these are typos. 
Could you check this patch?

2004-12-26  Masatake YAMATO  <jet@gyve.org>

	* src/otvalid/otvcommn.h (OTV_NEST1, OTV_NEST2, OTV_NEST3): Pass
	extra arguments generated by `#' preprocessor operator to
	OTV_NEST1_, OTV_NEST2_, OTV_NEST3_.

--- orig/src/otvalid/otvcommn.h
+++ mod/src/otvalid/otvcommn.h
@@ -112,7 +112,7 @@
 #ifdef FT_DEBUG_LEVEL_TRACE
 
   /* use preprocessor's argument prescan to expand one argument into two */
-#define OTV_NEST1( x )  OTV_NEST1_( x )
+#define OTV_NEST1( x )  OTV_NEST1_( x, #x )
 #define OTV_NEST1_( func0, name0 )                 \
           FT_BEGIN_STMNT                           \
             valid->nesting_level          = 0;     \
@@ -121,7 +121,7 @@
           FT_END_STMNT
 
   /* use preprocessor's argument prescan to expand two arguments into four */
-#define OTV_NEST2( x, y )  OTV_NEST2_( x, y )
+#define OTV_NEST2( x, y )  OTV_NEST2_( x, #x, y, #y )
 #define OTV_NEST2_( func0, name0, func1, name1 )   \
           FT_BEGIN_STMNT                           \
             valid->nesting_level          = 0;     \
@@ -132,7 +132,7 @@
           FT_END_STMNT
 
   /* use preprocessor's argument prescan to expand three arguments into six */
-#define OTV_NEST3( x, y, z )  OTV_NEST3_( x, y, z )
+#define OTV_NEST3( x, y, z )  OTV_NEST3_( x, #x, y, #y, z, #z )
 #define OTV_NEST3_( func0, name0, func1, name1, func2, name2 ) \
           FT_BEGIN_STMNT                                       \
             valid->nesting_level          = 0;                 \
@@ -172,7 +172,7 @@
 #else   /* !FT_DEBUG_LEVEL_TRACE */
 
   /* use preprocessor's argument prescan to expand one argument into two */
-#define OTV_NEST1( x )  OTV_NEST1_( x )
+#define OTV_NEST1( x )  OTV_NEST1_( x, #x )
 #define OTV_NEST1_( func0, name0 )        \
           FT_BEGIN_STMNT                  \
             valid->nesting_level = 0;     \
@@ -180,7 +180,7 @@
           FT_END_STMNT
 
   /* use preprocessor's argument prescan to expand two arguments into four */
-#define OTV_NEST2( x, y )  OTV_NEST2_( x, y )
+#define OTV_NEST2( x, y )  OTV_NEST2_( x, #x, y, #y )
 #define OTV_NEST2_( func0, name0, func1, name1 ) \
           FT_BEGIN_STMNT                         \
             valid->nesting_level = 0;            \
@@ -189,7 +189,7 @@
           FT_END_STMNT
 
   /* use preprocessor's argument prescan to expand three arguments into six */
-#define OTV_NEST3( x, y, z )  OTV_NEST3_( x, y, z )
+#define OTV_NEST3( x, y, z )  OTV_NEST3_( x, #x, y, #y, z, #z )
 #define OTV_NEST3_( func0, name0, func1, name1, func2, name2 ) \
           FT_BEGIN_STMNT                                       \
             valid->nesting_level = 0;                          \





_______________________________________________
Devel mailing list
Devel@freetype.org
http://www.freetype.org/mailman/listinfo/devel
[prev in list] [next in list] [prev in thread] [next in thread]