summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-09 10:23:55 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-09 10:23:55 +0000
commita733dbeabbb7954a1c5cef21fbac386515aaecfa (patch)
tree84c06c40d131d25491db0f211dfd88731c5d3170 /include
parentbc6df4be67d1cdac0e22a7d86d312c0e1b0436c9 (diff)
Patch from peavey to fix GCC3.3 crash correctly, without breaking other stuff randomly (<3.)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5663 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
-rw-r--r--include/configreader.h25
1 files changed, 16 insertions, 9 deletions
diff --git a/include/configreader.h b/include/configreader.h
index e0bab84bd..e6591e7a8 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -115,20 +115,11 @@ class ServerConfig : public Extensible
InspIRCd* GetInstance();
-
- /** All oper class definitions from the config file
- */
- operclass_t operclass;
-
/** This holds all the information in the config file,
* it's indexed by tag name to a vector of key/values.
*/
ConfigDataHash config_data;
- /* All oper type definitions from the config file
- */
- opertype_t opertypes;
-
/** Holds the server name of the local server
* as defined by the administrator.
*/
@@ -401,6 +392,22 @@ class ServerConfig : public Extensible
*/
bool CycleHosts;
+
+#if __GNUC__ == 3 && __GNUC_MINOR__ == 3
+ /** if we're being compiled with GCC 3.3 add
+ * dummy opertype on heap to fix GCC 3.3 crash
+ */
+ opertype_t dummyopertype;
+#endif
+
+ /** All oper type definitions from the config file
+ */
+ opertype_t opertypes;
+
+ /** All oper class definitions from the config file
+ */
+ operclass_t operclass;
+
/** Construct a new ServerConfig
*/
ServerConfig(InspIRCd* Instance);