[dia/zbrown/graphene-rect: 11/11] win32: try to have quieter builds




commit a3644317a7764a131709b9513bc16677f4416e3e
Author: Zander Brown <zbrown gnome org>
Date:   Wed Apr 7 00:01:49 2021 +0100

    win32: try to have quieter builds

 lib/color.c    | 2 --
 lib/color.h    | 9 ++-------
 lib/libdia.def | 5 +++++
 3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/lib/color.c b/lib/color.c
index af56978b7..2ec22b867 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -26,10 +26,8 @@
 
 static GdkColormap *colormap = NULL;
 
-#ifndef G_OS_WIN32
 Color color_black = { 0.0f, 0.0f, 0.0f, 1.0f };
 Color color_white = { 1.0f, 1.0f, 1.0f, 1.0f };
-#endif
 
 gboolean _color_initialized = FALSE;
 
diff --git a/lib/color.h b/lib/color.h
index 87d1096d4..b04b88969 100644
--- a/lib/color.h
+++ b/lib/color.h
@@ -56,13 +56,8 @@ void          color_convert        (const Color *color,
 gboolean      color_equals         (const Color *color1,
                                     const Color *color2);
 
-#ifdef G_OS_WIN32
-static Color color_black = { 0.0f, 0.0f, 0.0f, 1.0f };
-static Color color_white = { 1.0f, 1.0f, 1.0f, 1.0f };
-#else
-extern DIAVAR Color color_black;
-extern DIAVAR Color color_white;
-#endif
+extern Color color_black;
+extern Color color_white;
 
 #define DIA_COLOR_TO_GDK(from, to)      \
   (to).pixel = 0;                       \
diff --git a/lib/libdia.def b/lib/libdia.def
index 518acc236..0e21ac399 100644
--- a/lib/libdia.def
+++ b/lib/libdia.def
@@ -831,6 +831,7 @@ EXPORTS
  text_set_font
  text_set_height
  text_set_position
+ dia_text_get_position
  text_set_string
 
  text_line_new
@@ -893,3 +894,7 @@ EXPORTS
  cairo_export_data
  cairo_print_callback
  dia_cairo_renderer_get_type
+
+
+ color_black
+ color_white


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]