t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log4cpp is mandatory for GNU Radio

Browse Source
This commit is contained in:
Bastian Bloessl
2016-09-15 11:01:13 +02:00
parent 0bd2e30f55
commit c1d50c7ff2
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -5
View File
@@ -94,11 +94,8 @@ if(NOT CPPUNIT_FOUND)
message(FATAL_ERROR "CppUnit required to compile ieee802-11") message(FATAL_ERROR "CppUnit required to compile ieee802-11")
endif() endif()
if (LOG4CPP_FOUND) if(NOT LOG4CPP_FOUND)
message(STATUS "Found LOG4CPP: ${LOG4CPP_LIBRARIES}") message(FATAL_ERROR "LOG4CPP required to compile ieee802-11")
add_definitions("-DGR_IEEE80211_LOG4CPP")
else ()
message(STATUS "LOG4CPP not found (not required).")
endif () endif ()
######################################################################## ########################################################################
lib/utils.h
-5
View File
@@ -29,12 +29,7 @@
#define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288) #define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288)
#define dout d_debug && std::cout #define dout d_debug && std::cout
#if defined(HAVE_LOG4CPP) && defined(ENABLE_GR_LOG) && defined(GR_IEEE80211_LOG4CPP)
#define mylog(msg) do { if(d_log) { GR_LOG_INFO(d_logger, msg) }} while(0); #define mylog(msg) do { if(d_log) { GR_LOG_INFO(d_logger, msg) }} while(0);
#else
#define mylog(msg) do { d_log && std::cout << msg << std::endl; } while(0);
#endif
struct mac_header { struct mac_header {
//protocol version, type, subtype, to_ds, from_ds, ... //protocol version, type, subtype, to_ds, from_ds, ...