Context Navigation

← Previous Change
Next Change →

Changeset 21494 for trunk/src/shell32

Timestamp:

Dec 2, 2010, 1:19:12 AM (15 years ago)

Author:

dmik

Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:

trunk/src/shell32

Files:

: 15 edited

changenotify.c (modified) (1 diff)
classes.c (modified) (1 diff)
clipboard.c (modified) (1 diff)
dataobject.c (modified) (1 diff)
dbgwrap.cpp (modified) (1 diff)
enumidlist.c (modified) (1 diff)
folders.c (modified) (1 diff)
iconcache.c (modified) (1 diff)
misc.cpp (modified) (1 diff)
sh.cpp (modified) (1 diff)
she.cpp (modified) (1 diff)
shell.c (modified) (1 diff)
shell32_main.c (modified) (1 diff)
shell32_odin.cpp (modified) (1 diff)
shellstub.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/shell32/changenotify.c

r9805	r21494
20	20	*/
21	21	#ifdef __WIN32OS2__
22		#define ~~ICOM_CINTERFACE 1~~
	22	#define CINTERFACE
23	23	#include <odin.h>
24	24	#endif

trunk/src/shell32/classes.c

r8048	r21494
7	7	*/
8	8	#ifdef __WIN32OS2__
9		#define ~~ICOM_CINTERFACE 1~~
	9	#define CINTERFACE
10	10	#include <odin.h>
11	11	#endif

trunk/src/shell32/clipboard.c

r8614	r21494
21	21	*/
22	22	#ifdef __WIN32OS2__
23		#define ~~ICOM_CINTERFACE 1~~
	23	#define CINTERFACE
24	24	#include <odin.h>
25	25	#endif

trunk/src/shell32/dataobject.c

r8614	r21494
8	8	*/
9	9	#ifdef __WIN32OS2__
10		#define ~~ICOM_CINTERFACE 1~~
	10	#define CINTERFACE
11	11	#include <odin.h>
12	12	#endif

trunk/src/shell32/dbgwrap.cpp

-              r21464
+              r21494
 #include <heapstring.h>
+#define ICOM_CINTERFACE 1
+#define CINTERFACE 1
+#define CINTERFACE
 //#define NO_SHLWAPI_STREAM

trunk/src/shell32/enumidlist.c

r10185	r21494
6	6	*/
7	7	#ifdef __WIN32OS2__
8		#define ~~ICOM_CINTERFACE 1~~
	8	#define CINTERFACE
9	9	#include <odin.h>
10	10	#endif

trunk/src/shell32/folders.c

r8614	r21494
6	6	*/
7	7	#ifdef __WIN32OS2__
8		#define ~~ICOM_CINTERFACE 1~~
	8	#define CINTERFACE
9	9	#include <odin.h>
10	10	#include "shellicon.h"

trunk/src/shell32/iconcache.c

r10347	r21494
5	5	*/
6	6	#ifdef __WIN32OS2__
7		#define ~~ICOM_CINTERFACE 1~~
	7	#define CINTERFACE
8	8	#include <odin.h>
9	9	#endif

trunk/src/shell32/misc.cpp

r8614	r21494
22	22	#include <wcstr.h>
23	23
24		#define ~~ICOM_CINTERFACE 1~~
	24	#define CINTERFACE
25	25
26	26	//#include <os2win.h>

trunk/src/shell32/sh.cpp

r10314	r21494
25	25	#include <string.h>
26	26
27		#define ~~ICOM_CINTERFACE 1~~
	27	#define CINTERFACE
28	28	#include "shell32_main.h"
29	29	#include <win\shlobj.h>

trunk/src/shell32/she.cpp

r7904	r21494
25	25
26	26
27		#define ~~ICOM_CINTERFACE 1~~
	27	#define CINTERFACE
28	28	#include "shell32_main.h"
29	29

trunk/src/shell32/shell.c

r8048	r21494
6	6	*/
7	7	#ifdef __WIN32OS2__
8		#define ~~ICOM_CINTERFACE 1~~
	8	#define CINTERFACE
9	9	#include <odin.h>
10	10	#endif

trunk/src/shell32/shell32_main.c

r21464	r21494
7	7	*/
8	8	#ifdef __WIN32OS2__
9		#define ~~ICOM_CINTERFACE 1~~
	9	#define CINTERFACE
10	10	#include <odin.h>
11	11	#endif

trunk/src/shell32/shell32_odin.cpp

-              r8614
+              r21494
 #include <string.h>
+#define ICOM_CINTERFACE 1
+#define CINTERFACE 1
+#define CINTERFACE
 #include "winerror.h"

trunk/src/shell32/shellstub.cpp

-              r10259
+              r21494
 #include <odin.h>
+#define ICOM_CINTERFACE 1
+#define CINTERFACE 1
+#define CINTERFACE
 #include "debugtools.h"

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: