|
From: Andre R. <and...@us...> - 2004-10-28 21:07:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510/Frontier/Common/headers Modified Files: frontierdebug.h Log Message: Fixed some GCC compiler warnings. Index: frontierdebug.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdebug.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frontierdebug.h 9 Oct 2004 20:55:30 -0000 1.1 --- frontierdebug.h 28 Oct 2004 21:07:12 -0000 1.2 *************** *** 72,77 **** #define ASSERT_1(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_1(x) ((void *) nil) ! #define ASSERT_1(x) ((void *) nil) #endif --- 72,77 ---- #define ASSERT_1(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_1(x) ! #define ASSERT_1(x) #endif *************** *** 80,85 **** #define ASSERT_2(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_2(x) ((void *) nil) ! #define ASSERT_2(x) ((void *) nil) #endif --- 80,85 ---- #define ASSERT_2(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_2(x) ! #define ASSERT_2(x) #endif *************** *** 88,93 **** #define ASSERT_3(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_3(x) ((void *) nil) ! #define ASSERT_3(x) ((void *) nil) #endif --- 88,93 ---- #define ASSERT_3(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_3(x) ! #define ASSERT_3(x) #endif *************** *** 99,104 **** #define TCP_ASSERT_1(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_1(x) ((void *) nil) ! #define TCP_ASSERT_1(x) ((void *) nil) #endif --- 99,104 ---- #define TCP_ASSERT_1(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_1(x) ! #define TCP_ASSERT_1(x) #endif *************** *** 107,112 **** #define TCP_ASSERT_2(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_2(x) ((void *) nil) ! #define TCP_ASSERT_2(x) ((void *) nil) #endif --- 107,112 ---- #define TCP_ASSERT_2(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_2(x) ! #define TCP_ASSERT_2(x) #endif *************** *** 115,120 **** #define TCP_ASSERT_3(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_3(x) ((void *) nil) ! #define TCP_ASSERT_3(x) ((void *) nil) #endif --- 115,120 ---- #define TCP_ASSERT_3(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_3(x) ! #define TCP_ASSERT_3(x) #endif *************** *** 126,131 **** #define DB_ASSERT_1(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_1(x) ((void *) nil) ! #define DB_ASSERT_1(x) ((void *) nil) #endif --- 126,131 ---- #define DB_ASSERT_1(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_1(x) ! #define DB_ASSERT_1(x) #endif *************** *** 134,139 **** #define DB_ASSERT_2(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_2(x) ((void *) nil) ! #define DB_ASSERT_2(x) ((void *) nil) #endif --- 134,139 ---- #define DB_ASSERT_2(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_2(x) ! #define DB_ASSERT_2(x) #endif *************** *** 142,147 **** #define DB_ASSERT_3(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_3(x) ((void *) nil) ! #define DB_ASSERT_3(x) ((void *) nil) #endif --- 142,147 ---- #define DB_ASSERT_3(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_3(x) ! #define DB_ASSERT_3(x) #endif *************** *** 153,158 **** #define THREADS_ASSERT_1(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_1(x) ((void *) nil) ! #define THREADS_ASSERT_1(x) ((void *) nil) #endif --- 153,158 ---- #define THREADS_ASSERT_1(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_1(x) ! #define THREADS_ASSERT_1(x) #endif *************** *** 161,166 **** #define THREADS_ASSERT_2(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_2(x) ((void *) nil) ! #define THREADS_ASSERT_2(x) ((void *) nil) #endif --- 161,166 ---- #define THREADS_ASSERT_2(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_2(x) ! #define THREADS_ASSERT_2(x) #endif *************** *** 169,174 **** #define THREADS_ASSERT_3(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_3(x) ((void *) nil) ! #define THREADS_ASSERT_3(x) ((void *) nil) #endif --- 169,174 ---- #define THREADS_ASSERT_3(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_3(x) ! #define THREADS_ASSERT_3(x) #endif |