# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1621820907 0 # Node ID da058319f71736af574c0b6df2dbe0214e206f07 # Parent d59d579dc6ec1862e919260629091b73703cac49 OS/2: HTIMER alread defined, just set HTIMER_TYPEDEFED. Use HTIMER internaly instead of int. diff -r d59d579dc6ec -r da058319f717 dw.h --- a/dw.h Sun May 23 21:48:25 2021 +0000 +++ b/dw.h Mon May 24 01:48:27 2021 +0000 @@ -156,6 +156,8 @@ #include +#define HTIMER_TYPEDEFED 1 + #define DW_DT_LEFT DT_LEFT #define DW_DT_QUERYEXTENT DT_QUERYEXTENT #define DW_DT_UNDERSCORE DT_UNDERSCORE diff -r d59d579dc6ec -r da058319f717 os2/dw.c --- a/os2/dw.c Sun May 23 21:48:25 2021 +0000 +++ b/os2/dw.c Mon May 24 01:48:27 2021 +0000 @@ -13529,7 +13529,7 @@ { if(sigfunc) { - int timerid = WinStartTimer(dwhab, NULLHANDLE, 0, interval); + HTIMER timerid = WinStartTimer(dwhab, NULLHANDLE, 0, interval); if(timerid) {