[ros-diffs] [fireball] 42063: - Add wine/port.h to event.c to have POLL* defines. - Add XBUTTON* defines to x11drv.h. - Add HAVE_POLL section to wine/port.h.

fireball at svn.reactos.org fireball at svn.reactos.org
Sat Jul 18 21:18:18 CEST 2009


Author: fireball
Date: Sat Jul 18 21:18:18 2009
New Revision: 42063

URL: http://svn.reactos.org/svn/reactos?rev=42063&view=rev
Log:
- Add wine/port.h to event.c to have POLL* defines.
- Add XBUTTON* defines to x11drv.h.
- Add HAVE_POLL section to wine/port.h.

Modified:
    branches/arwinss/reactos/dll/win32/winex11.drv/event.c
    branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h
    branches/arwinss/reactos/include/reactos/wine/port.h

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex11.drv/event.c?rev=42063&r1=42062&r2=42063&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Sat Jul 18 21:18:18 2009
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-
+#include "wine/port.h"
 #ifdef HAVE_POLL_H
 #include <poll.h>
 #endif

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h?rev=42063&r1=42062&r2=42063&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] Sat Jul 18 21:18:18 2009
@@ -785,4 +785,7 @@
 
 #define XEMBED_MAPPED  (1 << 0)
 
+#define XBUTTON1            0x0001
+#define XBUTTON2            0x0002
+
 #endif  /* __WINE_X11DRV_H */

Modified: branches/arwinss/reactos/include/reactos/wine/port.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/wine/port.h?rev=42063&r1=42062&r2=42063&view=diff
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/port.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/port.h [iso-8859-1] Sat Jul 18 21:18:18 2009
@@ -254,6 +254,22 @@
 void *memmove(void *dest, const void *src, size_t len);
 #endif /* !defined(HAVE_MEMMOVE) */
 
+#ifndef HAVE_POLL
+struct pollfd
+{
+    int fd;
+    short events;
+    short revents;
+};
+#define POLLIN   0x01
+#define POLLPRI  0x02
+#define POLLOUT  0x04
+#define POLLERR  0x08
+#define POLLHUP  0x10
+#define POLLNVAL 0x20
+int poll( struct pollfd *fds, unsigned int count, int timeout );
+#endif /* HAVE_POLL */
+
 #ifndef __REACTOS__
 #ifndef HAVE_PREAD
 ssize_t pread( int fd, void *buf, size_t count, off_t offset );



More information about the Ros-diffs mailing list