Some more winbase.h cleanup

Francois Gouget fgouget at free.fr
Sun Oct 7 21:27:03 CDT 2001


   A last batch of assorted macros that are not defined on windows and
are not used in Wine. I'm not sure about what to do with these.

 * The EV_xxx macros I ifdefed-out but left in winbase.h as there are a
number of related and legitimate EV_xxx macros. The problem with leaving
the definitions there is that if they represent a legitimate concept but
are missing on windows, it's likely that some application out there
defined them with just that name -> macro redefinition

 * GETBASEIRQ is not defined on Windows but used in a couple of places
in Wine so I put it in an '#ifdef __WINE__'.

 * CSTF_xxx. These are not used at all in Wine and I don't know where to
move them to. So I just removed them. Maybe they should be ifdefed-out
and kept for documentation purposes.


Changelog:

 * include/winbase.h

   Remove/ifdef-out non windows macros


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                            $live{free} || die "";
-------------- next part --------------
Index: include/winbase.h
===================================================================
RCS file: /home/wine/wine/include/winbase.h,v
retrieving revision 1.121
diff -u -r1.121 winbase.h
--- include/winbase.h	2001/10/05 19:44:33	1.121
+++ include/winbase.h	2001/10/07 22:23:44
@@ -335,11 +335,14 @@
 #define EV_ERR		0x0080
 #define EV_RING	0x0100
 #define EV_PERR	0x0200
+#if 0
+/* FIXME: These are not defined on Windows, and not used in Wine! */
 #define EV_CTSS	0x0400
 #define EV_DSRS	0x0800
 #define EV_RLSDS	0x1000
 #define EV_RINGTE	0x2000
 #define EV_RingTe	EV_RINGTE
+#endif
 
 #define SETXOFF	1
 #define SETXON		2
@@ -350,8 +353,10 @@
 #define RESETDEV	7
 #define SETBREAK	8
 #define CLRBREAK	9
-
+#ifdef __WINE__
+/* FIXME: Not defined on Windows */
 #define GETBASEIRQ	10
+#endif
 
 /* Purge functions for Comm Port */
 #define PURGE_TXABORT       0x0001  /* Kill the pending/current writes to the 
@@ -377,11 +382,4 @@
 #define	DTR_CONTROL_ENABLE	1
 #define	DTR_CONTROL_HANDSHAKE	2
 
-#define CSTF_CTSHOLD	0x01
-#define CSTF_DSRHOLD	0x02
-#define CSTF_RLSDHOLD	0x04
-#define CSTF_XOFFHOLD	0x08
-#define CSTF_XOFFSENT	0x10
-#define CSTF_EOF	0x20
-#define CSTF_TXIM	0x40
 


More information about the wine-patches mailing list