Eliminate __CONCAT1 and __CONCAT, we don't need that complexity

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4009 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath_hal/ah_osdep.h b/ath_hal/ah_osdep.h
index 8dca6bc7d054a533c5e59beb0740e7ccb0cd217f..fe3f97889c4263d75f08b1b01d040074329660d2 100644 (file)
--- a/ath_hal/ah_osdep.h
+++ b/ath_hal/ah_osdep.h
@@ -56,8 +56,6 @@
 
 /* Linker-assisted set support */
 #define        __STRING(x)     #x
-#define __CONCAT1(x,y) x ## y
-#define __CONCAT(x,y)  __CONCAT1(x,y)
 
 #define DECLARE_ah_chips \
 struct ath_hal_chip *AR5210_chip_ptr __attribute__((__weak__));        \
@@ -84,7 +82,7 @@ struct ath_hal_rf *RF2425_rf_ptr __attribute__((__weak__));   \
 struct ath_hal_rf *RF5111_rf_ptr __attribute__((__weak__));    \
 struct ath_hal_rf *RF5112_rf_ptr __attribute__((__weak__));    \
 struct ath_hal_rf *RF5413_rf_ptr __attribute__((__weak__));    \
-struct ath_hal_rf *const *ah_rfs_ptrs[] = {                            \
+struct ath_hal_rf *const *ah_rfs_ptrs[] = {                    \
        &RF2316_rf_ptr,                                         \
        &RF2317_rf_ptr,                                         \
        &RF2413_rf_ptr,                                         \
@@ -96,13 +94,13 @@ struct ath_hal_rf *const *ah_rfs_ptrs[] = {                         \
 }
 
 #define OS_SET_DECLARE(set, ptype)                             \
-       __CONCAT(DECLARE_,set)
+       DECLARE_##set
 
 #define OS_DATA_SET(set, sym)                                  \
-       typeof(sym) *__CONCAT(sym,_ptr) = &sym
+       typeof(sym) *sym##_ptr = &sym
 
 #define OS_SET_FOREACH(pvar, set)                              \
-       typeof(pvar) *ppvar = __CONCAT(set,_ptrs);              \
+       typeof(pvar) *ppvar = set##_ptrs;                       \
        for (pvar = *ppvar; pvar; pvar = *++ppvar) if (*pvar)
 
 /* Byte order/swapping support. */