From 4745d51361d5979688f6bcd3a1fde5d292809509 Mon Sep 17 00:00:00 2001 From: Amy Bowersox Date: Wed, 11 Dec 2019 10:54:09 -0700 Subject: [PATCH] fix some compile errors --- src/bitmap.c | 2 +- src/bitmap.h | 2 +- src/devctxt.h | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bitmap.c b/src/bitmap.c index 180d3f8..fa517ea 100755 --- a/src/bitmap.c +++ b/src/bitmap.c @@ -2,7 +2,7 @@ #include #include "bitmap.h" -PBITMAP BMP_Create(INT32 width, INT32 height, const VOID *bits) +PBITMAP BMP_Create(INT32 width, INT32 height, const void *bits) { PBITMAP rc; UINT32 tot_size = sizeof(BITMAP) + (width * height * sizeof(UINT16)); diff --git a/src/bitmap.h b/src/bitmap.h index db09917..f7500b5 100755 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -13,7 +13,7 @@ typedef struct tagBITMAP { UINT16 bits[0]; } BITMAP, *PBITMAP; -extern PBITMAP BMP_Create(INT32 width, INT32 height, const VOID *bits); +extern PBITMAP BMP_Create(INT32 width, INT32 height, const void *bits); extern void BMP_Delete(PBITMAP pbmp); #endif /* __BITMAP_H_INCLUDED */ \ No newline at end of file diff --git a/src/devctxt.h b/src/devctxt.h index f83fa2b..017e70a 100755 --- a/src/devctxt.h +++ b/src/devctxt.h @@ -26,10 +26,12 @@ #define R2_MERGEPEN 15 #define R2_WHITE 16 +struct tagDCTXT; /* forward declaration */ + typedef COLORREF (*DCtx_SetPixel)(PVOID privdata, INT32 x, INT32 y, COLORREF color, INT32 op); typedef BOOL (*DCtx_Line)(PVOID privdata, INT32 x1, INT32 y1, INT32 x2, INT32 y2, COLORREF color, INT32 op); typedef BOOL (*DCtx_SolidRect)(PVOID privdata, PRECT rect, COLORREF color, INT32 op); -typedef PDCTXT (*DCtx_CreateCompat)(PVOID privdata); +typedef struct tagDCTXT *(*DCtx_CreateCompat)(PVOID privdata); typedef BOOL (*DCtx_NewBitmap)(PVOID privdata, PBITMAP pbmp); typedef BOOL (*DCtx_BitBlt)(PVOID p_dest, PRECT r_dest, PVOID p_src, PRECT r_src, UINT32 op);