From 718844acb9a1a96db05519166e732f4c2dde91b7 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Mon, 9 Feb 2015 20:44:12 +0100
Subject: added a CRAWLER_UNUSED for lua specific module initialization code
 fixed to comile without WITH_flags (continued)

---
 include/util/Noreturn.hpp                                   |  2 +-
 include/util/Unused.hpp                                     | 12 ++++++++++++
 src/crawl/crawl.cpp                                         |  2 ++
 src/libcrawler/libcrawler.cpp                               |  8 +++-----
 src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp |  4 +++-
 src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp |  4 +++-
 6 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 include/util/Unused.hpp

diff --git a/include/util/Noreturn.hpp b/include/util/Noreturn.hpp
index 9f9862c..a3e3004 100644
--- a/include/util/Noreturn.hpp
+++ b/include/util/Noreturn.hpp
@@ -1,7 +1,7 @@
 #ifndef __NORETURN_H_
 #define __NORETURN_H
 
-#ifdef __GNUC__
+#if defined( __GNUC__ )
 #define CRAWLER_NORETURN __attribute__((noreturn))
 #else
 #define CRAWLER_NORETURN
diff --git a/include/util/Unused.hpp b/include/util/Unused.hpp
new file mode 100644
index 0000000..e04a8cf
--- /dev/null
+++ b/include/util/Unused.hpp
@@ -0,0 +1,12 @@
+#ifndef __UNUSED_H
+#define __UNUSED_H
+
+#if defined( __GNUC__ )
+#define CRAWLER_UNUSED( x ) x __attribute__( ( unused ) )
+#elif defined( __MSVC__ )
+#define CRAWLER_UNUSED( x ) __pragma( warning( suppress: 4100 4101 ) ) x
+#else
+#define CRAWLER_UNUSED( x ) x
+#endif
+
+#endif
diff --git a/src/crawl/crawl.cpp b/src/crawl/crawl.cpp
index 460d41a..5c121c0 100755
--- a/src/crawl/crawl.cpp
+++ b/src/crawl/crawl.cpp
@@ -217,7 +217,9 @@ int main( int /* argc */, char *argv[] )
 		lua_newtable( luaVm.handle( ) );
 		lua_pushstring( luaVm.handle( ), "create" );
 		lua_pushlightuserdata( luaVm.handle( ), &urlNormalizers );
+#ifdef WITH_LUA		
 		lua_pushcclosure( luaVm.handle( ), (lua_CFunction)urlNormalizers.luaCreateFunc, 1 );
+#endif
 		lua_settable( luaVm.handle( ), -3 );
 		lua_setglobal( luaVm.handle( ), "urlnormalizers" );
 
diff --git a/src/libcrawler/libcrawler.cpp b/src/libcrawler/libcrawler.cpp
index 5dc952f..384e138 100644
--- a/src/libcrawler/libcrawler.cpp
+++ b/src/libcrawler/libcrawler.cpp
@@ -2,17 +2,15 @@
 
 #include <iostream>
 
+#include "Unused.hpp"
+
 #ifdef WITH_LUA
 #include "tolua.h"
 #include "URLLua.hpp"
 #include "LuaVM.hpp"
 #endif
 
-void initialize_libcrawler( void *
-#ifdef WITH_LUA
-user_data
-#endif
-)
+void initialize_libcrawler( CRAWLER_UNUSED( void *user_data ) )
 {
 #ifdef WITH_LUA
 	LuaVM *vm = (LuaVM *)user_data;
diff --git a/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp b/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
index 734afea..776d4c1 100755
--- a/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
+++ b/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
@@ -6,6 +6,8 @@
 #include "url_canon_stdstring.h"
 #include "url_parse.h"
 
+#include "Unused.hpp"
+
 #ifdef WITH_LUA
 #include "tolua.h"
 #include "GoogleURLNormalizerLua.hpp"
@@ -112,7 +114,7 @@ URL GoogleURLNormalizer::normalize( const URL url, const string s )
 			"" );
 }
 
-static void initModule( void *user_data )
+static void initModule( CRAWLER_UNUSED( void *user_data ) )
 {
 #ifdef WITH_LUA
 	LuaVM *luaVm = (LuaVM *)user_data;
diff --git a/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp b/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
index 0ab1d05..d855781 100755
--- a/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
+++ b/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
@@ -3,6 +3,8 @@
 
 #include "SimpleURLNormalizer.hpp"
 
+#include "Unused.hpp"
+
 #ifdef WITH_LUA
 #include "tolua.h"
 #include "SimpleURLNormalizerLua.hpp"
@@ -156,7 +158,7 @@ void SimpleURLNormalizer::normalizePath( string &path )
 	}
 }
 
-static void initModule( void *user_data )
+static void initModule( CRAWLER_UNUSED( void *user_data ) )
 {
 #ifdef WITH_LUA
 	LuaVM *luaVm = (LuaVM *)user_data;
-- 
cgit v1.2.3-54-g00ecf