From fc42d28f65c9624d9c3bf3838ea512cb4f3f63cc Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Tue, 21 Jan 2020 10:38:20 +0800
Subject: [PATCH] remove unnecessary compilation conditions

---
 src/newgdi/glyph-old.c | 4 +---
 src/newgdi/glyph.c     | 8 ++------
 src/newgdi/pixel.c     | 6 +-----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/newgdi/glyph-old.c b/src/newgdi/glyph-old.c
index 9b95a667..b963e73a 100644
--- a/src/newgdi/glyph-old.c
+++ b/src/newgdi/glyph-old.c
@@ -1896,9 +1896,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
     }
 
 
-#ifndef _MGRM_THREADS
-    if (CHECK_DRAWING (pdc)) goto end;
-#endif
+    if (WITHOUT_DRAWING (pdc)) goto end;
 
     ENTER_DRAWING (pdc);
 
diff --git a/src/newgdi/glyph.c b/src/newgdi/glyph.c
index c78b083c..48aef579 100644
--- a/src/newgdi/glyph.c
+++ b/src/newgdi/glyph.c
@@ -2662,9 +2662,7 @@ int _gdi_draw_null_glyph (PDC pdc, int advance, BOOL direction,
         return advance;
     }
 
-#ifndef _MGRM_THREADS
-    if (CHECK_DRAWING (pdc)) goto end;
-#endif
+    if (WITHOUT_DRAWING (pdc)) goto end;
 
     pdc->cur_pixel = pdc->bkcolor;
     pdc->cur_ban = NULL;
@@ -2884,9 +2882,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
         goto end;
     }
 
-#ifndef _MGRM_THREADS
-    if (CHECK_DRAWING (pdc)) goto end;
-#endif
+    if (WITHOUT_DRAWING (pdc)) goto end;
 
     ENTER_DRAWING (pdc);
 
diff --git a/src/newgdi/pixel.c b/src/newgdi/pixel.c
index df333a7a..84860ac8 100644
--- a/src/newgdi/pixel.c
+++ b/src/newgdi/pixel.c
@@ -92,17 +92,13 @@ static void _my_set_pixel (PDC pdc, int x, int y, gal_pixel pixel)
         }
     }
 
-#ifndef _MGRM_THREADS
-    if (CHECK_DRAWING (pdc)) goto no_draw;
-#endif
+    if (WITHOUT_DRAWING (pdc)) goto no_draw;
 
     coor_LP2SP (pdc, &x, &y);
     pdc->cur_pixel = pixel;
     _set_pixel_helper (pdc, x, y);
 
-#ifndef _MGRM_THREADS
 no_draw:
-#endif
     UNLOCK_GCRINFO (pdc);
 }