Fix some compiler warnings.

warning: macro name is a reserved identifier [-Wreserved-id-macro]
warning: extra ';' after member function definition [-Wextra-semi]

diff --git a/configure b/configure
index d3569d0d04c27943da490a5d4531a65d0c15ecea..0cf165a0a4db485aac0f1625e7a91a8b586fd6d9 100755 (executable)
--- 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! */
                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 /**/
 
 /* this is for windows support. */
 #define CoreExport /**/

diff --git a/include/base.h b/include/base.h
index 0a4456f3a7fd398c2aea015b38dc88c76a5d5ded..19222a6f5d2ac4ac592ae84797c7044c31d7a1a1 100644 (file)
--- 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!
         */
         * 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.
         */
        /** Returns the reason for the exception.
         * The module should probably put something informative here as the user will see this upon failure.
         */