Mercurial > audlegacy-plugins

changeset 2556:d26db7f08124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 May 2008 22:16:40 +0300
parents 04b1b020be88 (current diff) d3432c34e817 (diff)
children f0c34c3b61c0
files
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/modplug/gui/main.cxx	Thu May 08 22:16:12 2008 +0300
+++ b/src/modplug/gui/main.cxx	Thu May 08 22:16:40 2008 +0300
@@ -5,6 +5,15 @@
 
 #include <config.h>
 
+#include "../stddefs.h"
+#include "../stdafx.h"
+#include "../sndfile.h"
+#include "../archive/open.h"
+
+// Order of #include is important - UINT is redefined to unsigned long instead of unsigned int 
+// somewhere in the following headers, which leads to unresolved symbol - 
+// linking is okay, error pops up when starting Audacious.
+
 #include <gtk/gtk.h>
 #include <libintl.h>
 extern "C" {
@@ -26,10 +35,6 @@
 #include <sys/mman.h>
 #include <fstream>
 
-#include "../stddefs.h"
-#include "../stdafx.h"
-#include "../sndfile.h"
-#include "../archive/open.h"
 
 #define MAX_MESSAGE_LENGTH 4000