2001-09-18 Danny Smith <dannysmith@users.sourceforge.net>

	* include/winnt.h (_[U]LARGE_INTEGER): Mark nameless structure
	field as _ANONYMOUS_STRUCT.
	* include/setupapi.h (SP_DEVINSTALL_PARAMS): Add missing typedef
	for UNICODE.
	* include/ipexport.h (icmp_echo_reply): Remove extra ';'.
	* lib/makefile.in: Add -pedantic switch to TEST_OPTIONS for header
	test.

2001-09-17  Mattia Barbon  <mbarbon@dsi.unive.it>

	* include/commctrl.h: Add some ListView constants.

2001-09-17  Earnie Boyd  <earnie@sf.net>

	* lib/Makefile.in (inst_includedir): Add FIXME and remove the usr/
	portion of the directory from the install.
	(inst_libdir): Ditto.
	* Makefile.in (VERSION): Increment.
	* include/w32api.h: Increment version.

6 files changed, 28 insertions, 5 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 812bec8f4..d2a88d7f0 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-18  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/winnt.h (_[U]LARGE_INTEGER): Mark nameless structure
+	field as _ANONYMOUS_STRUCT.
+	* include/setupapi.h (SP_DEVINSTALL_PARAMS): Add missing typedef
+	for UNICODE.
+	* include/ipexport.h (icmp_echo_reply): Remove extra ';'.
+	* lib/makefile.in: Add -pedantic switch to TEST_OPTIONS for header
+	test.
+ 
+2001-09-17  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+	* include/commctrl.h: Add some ListView constants.
+
 2001-09-17  Earnie Boyd  <earnie@sf.net>
 
 	* lib/Makefile.in (inst_includedir): Add FIXME and remove the usr/
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 6292910b1..3b97d01d1 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -634,10 +634,19 @@ extern "C" {
 #define LVCF_WIDTH	2
 #define LVCF_TEXT	4
 #define LVCF_SUBITEM	8
+#if (_WIN32_IE >= 0x0300)
+#define LVCF_IMAGE 16
+#define LVCF_ORDER 32
+#endif
 #define LVCFMT_LEFT	0
 #define LVCFMT_RIGHT	1
 #define LVCFMT_CENTER	2
 #define LVCFMT_JUSTIFYMASK	3
+#if (_WIN32_IE >= 0x0300)
+#define LVCFMT_BITMAP_ON_RIGHT 4096
+#define LVCFMT_COL_HAS_IMAGES  32768
+#define LVCFMT_IMAGE 2048 
+#endif
 #define LVM_GETCOLUMNA	(LVM_FIRST+25)
 #define LVM_GETCOLUMNW	(LVM_FIRST+95)
 #define LVM_SETCOLUMNA	(LVM_FIRST+26)
diff --git a/winsup/w32api/include/ipexport.h b/winsup/w32api/include/ipexport.h
index 9c9932545..4505dc467 100644
--- a/winsup/w32api/include/ipexport.h
+++ b/winsup/w32api/include/ipexport.h
@@ -65,7 +65,7 @@ typedef struct icmp_echo_reply {
   unsigned short    Reserved;
   void* Data;
   struct ip_option_information   Options;
-} ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;;
+} ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;
 typedef struct {
   ULONG Index;
   WCHAR  Name[MAX_ADAPTER_NAME];
diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h
index a40c75c13..3c653d5b5 100644
--- a/winsup/w32api/include/setupapi.h
+++ b/winsup/w32api/include/setupapi.h
@@ -966,7 +966,7 @@ typedef SP_INTERFACE_DEVICE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA,
     *PSP_INTERFACE_DEVICE_DETAIL_DATA; /* deprecated */
 typedef SP_DEVINFO_LIST_DETAIL_DATA_W SP_DEVINFO_LIST_DETAIL_DATA,
     *PSP_DEVINFO_LIST_DETAIL_DATA;
-typedef SP_DEVINSTALL_PARAMS_W, *PSP_DEVINSTALL_PARAMS;
+typedef SP_DEVINSTALL_PARAMS_W SP_DEVINSTALL_PARAMS, *PSP_DEVINSTALL_PARAMS;
 typedef SP_SELECTDEVICE_PARAMS_W SP_SELECTDEVICE_PARAMS, *PSP_SELECTDEVICE_PARAMS;
 typedef SP_TROUBLESHOOTER_PARAMS_W SP_TROUBLESHOOTER_PARAMS,
     *PSP_TROUBLESHOOTER_PARAMS;
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index d042192d6..b12224c45 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1706,7 +1706,7 @@ typedef union _LARGE_INTEGER {
     LONG  HighPart;
   } u;
 #if ! defined(NONAMELESSUNION) || defined(__cplusplus)
-  struct {
+  _ANONYMOUS_STRUCT struct {
     DWORD LowPart;
     LONG  HighPart;
   };
@@ -1719,7 +1719,7 @@ typedef union _ULARGE_INTEGER {
     DWORD HighPart;
   } u;
 #if ! defined(NONAMELESSUNION) || defined(__cplusplus)
-  struct {
+  _ANONYMOUS_STRUCT struct {
     DWORD LowPart;
     DWORD HighPart;
   };
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 9dda86b0e..6cd6ba95a 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -118,7 +118,7 @@ DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
 # targets
 all: $(LIBS) $(EXTRA_OBJS)
 
-TEST_OPTIONS = $(ALL_CFLAGS) -Wall -c $(srcdir)/test.c -o test.o
+TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -c $(srcdir)/test.c -o test.o
 .PHONY: test
 test:
 	@echo "Testing w32api..."