Commit in reactos on MAIN
lib/advapi32/makefile+6-31.45 -> 1.46
w32api/include/accctrl.h-111.4 -> 1.5
+6-14
2 modified files
sorry for defining structures twice...

reactos/lib/advapi32
makefile 1.45 -> 1.46
diff -u -r1.45 -r1.46
--- makefile	12 Dec 2004 15:17:38 -0000	1.45
+++ makefile	14 Dec 2004 00:00:40 -0000	1.46
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.45 2004/12/12 15:17:38 ekohl Exp $
+# $Id: makefile,v 1.46 2004/12/14 00:00:40 weiden Exp $
 
 PATH_TO_TOP = ../..
 
@@ -8,8 +8,11 @@
 
 TARGET_PCH = advapi32.h
 
-TARGET_CFLAGS = -Wall -Werror -fno-builtin -D__USE_W32API
-# TARGET_CFLAGS += -DUNICODE
+TARGET_CFLAGS = -Wall -Werror -fno-builtin \
+                -D__USE_W32API \
+                -D_WIN32_IE=0x0500 \
+                -D_WIN32_WINNT=0x501 \
+                -DWINVER=0x600 \
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 

reactos/w32api/include
accctrl.h 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- accctrl.h	13 Dec 2004 21:45:36 -0000	1.4
+++ accctrl.h	14 Dec 2004 00:00:41 -0000	1.5
@@ -352,17 +352,6 @@
     ULONG Placeholder;
 } FN_OBJECT_MGR_FUNCTS, *PFN_OBJECT_MGR_FUNCTS;
 
-typedef struct _INHERITED_FROMA
-{
-    LONG GenerationGap;
-    LPSTR AncestorName;
-} INHERITED_FROMA, *PINHERITED_FROMA;
-typedef struct _INHERITED_FROMW
-{
-    LONG GenerationGap;
-    LPWSTR AncestorName;
-} INHERITED_FROMW, *PINHERITED_FROMW;
-
 #ifdef UNICODE
 #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW
 typedef TRUSTEE_W TRUSTEE_, *PTRUSTEE_;
CVSspam 0.2.8