2006-06-02 Danny Smith <dannysmith@users.sourceforge.net>

	* include/winuser.h (DM_BITSPERPEL, DM_PELSWIDTH, DM_PELSHEIGHT,
	DM_DISPLAYFLAGS, DM_DISPLAYFREQUENCY): Remove.  Duplicates of
	wingdi.h defines.

2006-06-02  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>

	* include/winuser.h ((SPI_GETMOUSETRAILS,SPI_SETMOUSETRAILS): Remove
	duplicate defines.

	* include/winnt.h (SUBLANG_ARABIC_SAUDI_ARABIA): Revert accidental removal.
         (SUBLANG_MARATHI_INDIA): Remove duplicate define.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 5ce2f73..79181db 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,18 @@
+2006-06-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/winuser.h (DM_BITSPERPEL, DM_PELSWIDTH, DM_PELSHEIGHT,
+       DM_DISPLAYFLAGS, DM_DISPLAYFREQUENCY): Remove.  Duplicates of
+       wingdi.h defines.
+
+2006-06-02  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+       * include/winuser.h ((SPI_GETMOUSETRAILS,SPI_SETMOUSETRAILS): Remove
+       duplicate defines.
+
+       * include/winnt.h (SUBLANG_ARABIC_SAUDI_ARABIA): Revert accidental
+       removal.
+        (SUBLANG_MARATHI_INDIA): Remove duplicate define.
+
 2006-05-24  Christopher Faylor  <cgf@timesys.com>
 
        * configure.in: Update to newer autoconf.

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 704df0e..9a9ae57 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -638,6 +638,7 @@ typedef DWORD FLONG;
 #define SUBLANG_ALBANIAN_ALBANIA       0x01
 #define SUBLANG_ALSATIAN_FRANCE        0x01
 #define SUBLANG_AMHARIC_ETHIOPIA       0x01
+#define SUBLANG_ARABIC_SAUDI_ARABIA    0x01
 #define SUBLANG_ARABIC_IRAQ    0x02
 #define SUBLANG_ARABIC_EGYPT   0x03
 #define SUBLANG_ARABIC_LIBYA   0x04
@@ -757,7 +758,6 @@ typedef DWORD FLONG;
 #define SUBLANG_MAORI_NEW_ZEALAND      0x01
 #define SUBLANG_MAPUDUNGUN_CHILE       0x01
 #define SUBLANG_MARATHI_INDIA  0x01
-#define SUBLANG_MARATHI_INDIA  0x01
 #define SUBLANG_MOHAWK_MOHAWK  0x01
 #define SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA    0x01
 #define SUBLANG_MONGOLIAN_PRC  0x02

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 8824fb3..eae1f46 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -151,11 +151,6 @@ extern "C" {
 #define BROADCAST_QUERY_DENY   1112363332
 #define ENUM_CURRENT_SETTINGS  ((DWORD)-1)
 #define ENUM_REGISTRY_SETTINGS ((DWORD)-2)
-#define DM_BITSPERPEL  0x40000
-#define DM_PELSWIDTH   0x80000
-#define DM_PELSHEIGHT  0x100000
-#define DM_DISPLAYFLAGS 0x200000
-#define DM_DISPLAYFREQUENCY 0x400000
 #define CDS_UPDATEREGISTRY     1
 #define CDS_TEST       2
 #define CDS_FULLSCREEN 4
@@ -1317,7 +1312,6 @@ extern "C" {
 #define SPI_GETMOUSECLICKLOCK 0x101E
 #define SPI_GETMOUSECLICKLOCKTIME 0x2008
 #define SPI_GETMOUSESONAR 0x101C
-#define SPI_GETMOUSETRAILS 0x005E
 #define SPI_GETMOUSEVANISH 0x1020
 #define SPI_SETDROPSHADOW 0x1025
 #define SPI_SETFLATMENU 0x1023
@@ -1328,7 +1322,6 @@ extern "C" {
 #define SPI_SETMOUSECLICKLOCK 0x101F
 #define SPI_SETMOUSECLICKLOCKTIME 0x2009
 #define SPI_SETMOUSESONAR 0x101D
-#define SPI_SETMOUSETRAILS 0x005D
 #define SPI_SETMOUSEVANISH 0x1021
 #endif
 #define SPIF_UPDATEINIFILE 0x0001