SF.net SVN: mahogany:[7563] trunk/M/include

Revision: 7563
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7563&view=rev
Author:   vadz
Date:     2009-03-29 13:06:23 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
include Mcclient.h after wx headers to fix compilation when wxUSE_IPV6==1 (in this case we need to include winsock2.h first which is done by wx headers but not c-client ones)

Modified Paths:
--------------
    trunk/M/include/Mcclient.h
    trunk/M/include/Mpch.h

Modified: trunk/M/include/Mcclient.h
===================================================================
--- trunk/M/include/Mcclient.h	2009-03-29 13:05:31 UTC (rev 7562)
+++ trunk/M/include/Mcclient.h	2009-03-29 13:06:23 UTC (rev 7563)
@@ -20,6 +20,13 @@
 #     define cc_not not
 #  endif //M_LOGICAL_OP_NAMES
 
+#  ifdef OS_WIN
+      // if windows.h had been already included it defined ERROR which c-client
+      // redefines, avoid warnings about it (we don't really care about Windows
+      // constant, we don't use it)
+   #undef ERROR
+#endif // OS_WIN
+
 #  include <stdio.h>
 #  include <mail.h>
 #  include <osdep.h>

Modified: trunk/M/include/Mpch.h
===================================================================
--- trunk/M/include/Mpch.h	2009-03-29 13:05:31 UTC (rev 7562)
+++ trunk/M/include/Mpch.h	2009-03-29 13:06:23 UTC (rev 7563)
@@ -24,12 +24,12 @@
 #  undef USE_IPC  // it's in conflict with a standard Windows constant
 #endif   //Windows
 
-#include "Mcclient.h"
-
 #include <wx/wx.h>
 #include <wx/config.h>
 #include <wx/help.h>
 
+#include "Mcclient.h"
+
 #include "Mcommon.h"
 
 #include "kbList.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------