diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_sqlauth.cpp | 1 | ||||
| -rw-r--r-- | src/modules/extra/m_sqlite3.cpp | 3 | ||||
| -rw-r--r-- | src/modules/extra/m_sqllog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/extra/m_sqloper.cpp | 1 | ||||
| -rw-r--r-- | src/modules/extra/m_sqlutils.cpp | 1 |
8 files changed, 10 insertions, 6 deletions
@@ -1008,7 +1008,7 @@ sub getosflags { $config{LDLIBS} = "-lstdc++"; $config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}"; - $config{DEVELOPER} = "-fPIC -Wall -pedantic -g"; + $config{DEVELOPER} = "-fPIC -Wall -std=c99 -pedantic -g"; $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared"; $config{MAKEPROG} = "make"; diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 1feb3b02b..485c5542d 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -22,7 +22,7 @@ /* VERSION 2 API: With nonblocking (threaded) requests */ /* $ModDesc: SQL Service Provider module for all other m_sql* modules */ -/* $CompileFlags: exec("mysql_config --include") */ +/* $CompileFlags: -Wno-variadic-macros exec("mysql_config --include") */ /* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */ /* $ModDep: m_sqlv2.h */ /* $NoPedantic */ diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 34e653e2a..e9179ee24 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -22,7 +22,7 @@ #include "m_sqlv2.h" /* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */ -/* $CompileFlags: -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */ +/* $CompileFlags: -Wno-variadic-macros -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */ /* $LinkerFlags: -Lexec("pg_config --libdir") -lpq */ /* $ModDep: m_sqlv2.h */ diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 98b0227e5..4ebc7ba09 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -20,6 +20,7 @@ /* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */ /* $ModDep: m_sqlv2.h m_sqlutils.h */ +/* $CompileFlags: -Wno-variadic-macros */ class ModuleSQLAuth : public Module { diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 6ba5967f3..77b269e04 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -20,11 +20,10 @@ #include "m_sqlv2.h" /* $ModDesc: sqlite3 provider */ -/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ +/* $CompileFlags: -Wno-variadic-macros pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */ /* $ModDep: m_sqlv2.h */ - class SQLConn; class SQLite3Result; class ResultNotifier; diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index 9376ad265..7f655a45b 100644 --- a/src/modules/extra/m_sqllog.cpp +++ b/src/modules/extra/m_sqllog.cpp @@ -18,6 +18,8 @@ #include "configreader.h" #include "m_sqlv2.h" +/* $CompileFlags: -Wno-variadic-macros */ + static Module* SQLModule; static Module* MyMod; static std::string dbid; @@ -135,7 +137,7 @@ public: if (res->Rows() && hostid == -1 && !insert) { hostid = atoi(res->GetValue(0,0).d.c_str()); - req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES("+ConvToStr(category)+","+ConvToStr(nickid)+","+ConvToStr(hostid)+","+ConvToStr(sourceid)+","+ConvToStr(date)+")"); + req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES('?','?','?','?','?')", category, nickid, hostid , sourceid, date); if(req.Send()) { insert = true; diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 530662870..c9149322c 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -24,6 +24,7 @@ /* $ModDesc: Allows storage of oper credentials in an SQL table */ /* $ModDep: m_sqlv2.h m_sqlutils.h */ +/* $CompileFlags: -Wno-variadic-macros */ class ModuleSQLOper : public Module { diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 07cecc698..1a5b5c1c0 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -22,6 +22,7 @@ /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */ /* $ModDep: m_sqlutils.h */ +/* $CompileFlags: -Wno-variadic-macros */ typedef std::map<unsigned long, User*> IdUserMap; typedef std::map<unsigned long, Channel*> IdChanMap; |