From 3b9219748d40b4a08328293c7be4af5b632a3a25 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 19 Mar 2011 03:56:35 +0000
Subject: [PATCH] warnings--

SVN revision: 57877
---
 legacy/evas/src/lib/canvas/evas_object_textblock.c       | 2 ++
 legacy/evas/src/lib/engines/common/evas_font_private.h   | 9 +++++----
 legacy/evas/src/lib/engines/common/evas_pipe.c           | 1 +
 legacy/evas/src/lib/engines/common_16/evas_soft16_line.c | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0f93259129..c7cdb16c70 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -2171,6 +2171,8 @@ _layout_line_order(Ctxt *c __UNUSED__, Evas_Object_Textblock_Line *line)
      }
 
    if (v_to_l) free(v_to_l);
+#else
+   line = NULL;
 #endif
 }
 
diff --git a/legacy/evas/src/lib/engines/common/evas_font_private.h b/legacy/evas/src/lib/engines/common/evas_font_private.h
index cc68578a1a..eed3faf0f0 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_private.h
+++ b/legacy/evas/src/lib/engines/common/evas_font_private.h
@@ -24,6 +24,11 @@ extern LK(lock_ot); // for harfbuzz calls
 #  define BIDILOCK()
 #  define BIDIUNLOCK()
 
+/* Macros for text walking */
+#  define OTLOCK()
+#  define OTUNLOCK()
+# endif
+
 void evas_common_font_source_unload(RGBA_Font_Source *fs);
 void evas_common_font_source_reload(RGBA_Font_Source *fs);
 
@@ -32,10 +37,6 @@ void evas_common_font_int_use_increase(int size);
 void evas_common_font_int_use_trim(void);
 void evas_common_font_int_unload(RGBA_Font_Int *fi);
 void evas_common_font_int_reload(RGBA_Font_Int *fi);
-/* Macros for text walking */
-#  define OTLOCK()
-#  define OTUNLOCK()
-# endif
 
 /* 6th bit is on is the same as frac part >= 0.5 */
 # define EVAS_FONT_ROUND_26_6_TO_INT(x) \
diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/legacy/evas/src/lib/engines/common/evas_pipe.c
index bda94ee2af..1f1b030b41 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.c
+++ b/legacy/evas/src/lib/engines/common/evas_pipe.c
@@ -1,6 +1,7 @@
 // THIS IS DEPRECATED. WILL GO EVENTUALLTY. NO NEED TO SUPPORT ANYMORE
 
 #include "evas_common.h"
+#include <unistd.h>
 
 #ifdef BUILD_PIPE_RENDER
 
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_line.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_line.c
index 1884baf3f3..b22a85d384 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_line.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_line.c
@@ -376,6 +376,7 @@ evas_common_soft16_line_draw(Soft16_Image *dst, RGBA_Draw_Context *dc, int x0, i
    int dx, dy;
    int  x, y, w, h;
 
+   c_tmp.mask = NULL;
    c_tmp.use = 1;
    c_tmp.x = 0;
    c_tmp.y = 0;