diff options
author | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
commit | 59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch) | |
tree | a797879cc0fe54172dba50354b635b1f595081db /xorg-server/hw/xwin/winwindow.h | |
parent | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff) | |
parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
download | vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2 vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winkeynames.h
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.h')
-rw-r--r-- | xorg-server/hw/xwin/winwindow.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 8dd76caa9..e33319867 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -124,13 +124,13 @@ typedef struct _winWMMessageRec{ #define MwmHintsDecorations (1L << 1) -#define MwmDecorAll (1l << 0) -#define MwmDecorBorder (1l << 1) -#define MwmDecorHandle (1l << 2) -#define MwmDecorTitle (1l << 3) -#define MwmDecorMenu (1l << 4) -#define MwmDecorMinimize (1l << 5) -#define MwmDecorMaximize (1l << 6) +#define MwmDecorAll (1L << 0) +#define MwmDecorBorder (1L << 1) +#define MwmDecorHandle (1L << 2) +#define MwmDecorTitle (1L << 3) +#define MwmDecorMenu (1L << 4) +#define MwmDecorMinimize (1L << 5) +#define MwmDecorMaximize (1L << 6) /* This structure only contains 3 elements... the Motif 2.0 structure contains 5... we only need the first 3... so that is all we will define */ |