summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2017-03-20 10:24:01 +0000
committerPeter Powell <petpow@saberuk.com>2017-03-20 10:24:01 +0000
commit756c89cfccb4039bf5b4b59662a0bd7c379287a3 (patch)
tree728af85abeeebf72e3fc1a92d604429d9b5f65e1
parent567a117817fffb369ca9cc7fb0d55e3850ac41a7 (diff)
Fix some compiler warnings.
warning: macro name is a reserved identifier [-Wreserved-id-macro] warning: extra ';' after member function definition [-Wextra-semi]
-rwxr-xr-xconfigure4
-rw-r--r--include/base.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index d3569d0d0..0cf165a0a 100755
--- a/configure
+++ b/configure
@@ -840,8 +840,8 @@ sub writefiles {
open(FILEHANDLE, ">include/inspircd_config.h.tmp");
print FILEHANDLE <<EOF;
/* Auto generated by configure, do not modify! */
-#ifndef __CONFIGURATION_AUTO__
-#define __CONFIGURATION_AUTO__
+#ifndef INSPIRCD_CONFIG_H
+#define INSPIRCD_CONFIG_H
/* this is for windows support. */
#define CoreExport /**/
diff --git a/include/base.h b/include/base.h
index 0a4456f3a..19222a6f5 100644
--- a/include/base.h
+++ b/include/base.h
@@ -201,7 +201,7 @@ class CoreExport CoreException : public std::exception
* Actually no, it does nothing. Never mind.
* @throws Nothing!
*/
- virtual ~CoreException() throw() {};
+ virtual ~CoreException() throw() {}
/** Returns the reason for the exception.
* The module should probably put something informative here as the user will see this upon failure.
*/