diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2015-11-20 12:01:49 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2015-11-20 12:01:49 +0000 |
| commit | 6b720d25a1c3f6f236630db380979b980cf5e21e (patch) | |
| tree | 4f0a250cd97d0dbd1a5cda810443b05a6599d09e /hw/xwin/winmsg.h | |
| parent | 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd (diff) | |
| parent | d394c14f032c71e2dcb1850d0528e184e484f51f (diff) | |
Merge branch 'cygwin-patches-for-1.18' into cygwin-release-1.18xserver-cygwin-1.18.0-1
Diffstat (limited to 'hw/xwin/winmsg.h')
| -rw-r--r-- | hw/xwin/winmsg.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 6c96c4070..25d887510 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -1,5 +1,3 @@ -#ifndef __WIN_MSG_H__ -#define __WIN_MSG_H__ /* *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. * @@ -30,12 +28,17 @@ * Authors: Alexander Gottwald */ +#ifndef __WIN_MSG_H__ +#define __WIN_MSG_H__ + #include <X11/Xwindows.h> +#include <X11/Xfuncproto.h> /* * Function prototypes */ +#ifdef XWIN_XF86CONFIG void winDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, ...) @@ -43,12 +46,10 @@ _X_ATTRIBUTE_PRINTF(4, 5); void winDrvMsg(int scrnIndex, MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(3, 4); -void -winMsgVerb(MessageType type, int verb, const char *format, ...) -_X_ATTRIBUTE_PRINTF(3, 4); -void -winMsg(MessageType type, const char *format, ...) -_X_ATTRIBUTE_PRINTF(2, 3); +#endif + +#define winMsg LogMessage + void winDebug(const char *format, ...) _X_ATTRIBUTE_PRINTF(1, 2); @@ -59,6 +60,10 @@ _X_ATTRIBUTE_PRINTF(1, 2); void winErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2, 3); +void +winError(const char *format, ...) +_X_ATTRIBUTE_PRINTF(1, 2); + void winW32Error(int verb, const char *message); void winW32ErrorEx(int verb, const char *message, DWORD errorcode); void winDebugWin32Message(const char *function, HWND hwnd, UINT message, |