Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW
Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH
Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine
Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp
Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h
--- trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-10-02 18:28:36 UTC (rev 18227)
+++ trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-10-02 18:31:50 UTC (rev 18228)
@@ -9,7 +9,7 @@
LINK = g++
# -D_NO_ALPHABLEND for builds without msimg32.dll dependency
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC)
+CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)
RCFLAGS = -DWIN32 -D__WINDRES__
LFLAGS = -Wl,--subsystem,windows
--- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-10-02 18:28:36 UTC (rev 18227)
+++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-10-02 18:31:50 UTC (rev 18228)
@@ -10,7 +10,7 @@
CXX = g++
LINK = g++
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC)
+CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)
RCFLAGS = -DWIN32 -D__WINDRES__
LFLAGS = -Wl,--subsystem,windows
@@ -52,6 +52,7 @@
window.o \
dragdropimpl.o \
shellbrowserimpl.o \
+ shellservices.o \
explorer.o \
entries.o \
winfs.o \
@@ -69,7 +70,6 @@
desktopbar.o \
taskbar.o \
startmenu.o \
- shellservices.o \
traynotify.o \
quicklaunch.o \
favorites.o \
--- trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-10-02 18:28:36 UTC (rev 18227)
+++ trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-10-02 18:31:50 UTC (rev 18228)
@@ -126,7 +126,7 @@
LINT =
LINTFLAGS =
INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -Wno-unused-value
+EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith
ALLCFLAGS = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
--- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-10-02 18:28:36 UTC (rev 18227)
+++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-10-02 18:31:50 UTC (rev 18228)
@@ -46,9 +46,9 @@
// work around GCC's wide string constant bug
#ifdef __GNUC__
-const LPCXSSTR XMLStorage::XS_TRUE = XS_TEXT("true");
-const LPCXSSTR XMLStorage::XS_FALSE = XS_TEXT("false");
-const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_TEXT("%d");
+const LPCXSSTR XMLStorage::XS_TRUE = XS_TRUE_STR;
+const LPCXSSTR XMLStorage::XS_FALSE = XS_FALSE_STR;
+const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_NUMBERFMT_STR;
#endif
--- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-10-02 18:28:36 UTC (rev 18227)
+++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-10-02 18:31:50 UTC (rev 18228)
@@ -1228,15 +1228,19 @@
};
+#define XS_TRUE_STR XS_TEXT("true")
+#define XS_FALSE_STR XS_TEXT("false")
+#define XS_NUMBERFMT_STR XS_TEXT("%d")
+
// work around GCC's wide string constant bug
#ifdef __GNUC__
extern const LPCXSSTR XS_TRUE;
extern const LPCXSSTR XS_FALSE;
extern const LPCXSSTR XS_NUMBERFMT;
#else
-#define XS_TRUE XS_TEXT("true")
-#define XS_FALSE XS_TEXT("false")
-#define XS_NUMBERFMT XS_TEXT("%d")
+#define XS_TRUE XS_TRUE_STR
+#define XS_FALSE XS_FALSE_STR
+#define XS_NUMBERFMT XS_NUMBERFMT_STR
#endif