From d85b9507dc139ebedccdd67b4a3b5f46c6e2ab2c Mon Sep 17 00:00:00 2001
From: Adam Murdoch <adam.murdoch@gradleware.com>
Date: Fri, 13 Dec 2013 06:43:07 +1100
Subject: [PATCH] Fixed a couple of compiler warnings.

---
 src/curses/cpp/curses.cpp        | 1 +
 src/shared/cpp/generic_posix.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/curses/cpp/curses.cpp b/src/curses/cpp/curses.cpp
index 10633eb..c891d25 100644
--- a/src/curses/cpp/curses.cpp
+++ b/src/curses/cpp/curses.cpp
@@ -47,6 +47,7 @@ const char* terminal_capabilities[9];
 
 int write_to_terminal(TERMINAL_CHAR_TYPE ch) {
     write(current_terminal, &ch, 1);
+    return ch;
 }
 
 const char* getcap(const char* capability) {
diff --git a/src/shared/cpp/generic_posix.cpp b/src/shared/cpp/generic_posix.cpp
index a70a967..9dfbe27 100644
--- a/src/shared/cpp/generic_posix.cpp
+++ b/src/shared/cpp/generic_posix.cpp
@@ -48,7 +48,7 @@ char* java_to_char(JNIEnv *env, jstring string, jobject result) {
     env->ReleaseStringChars(string, javaString);
 
     size_t bytes = wcstombs(NULL, wideString, 0);
-    if (bytes < 0) {
+    if (bytes == (size_t)-1) {
         mark_failed_with_message(env, "could not convert string to current locale", result);
         free(wideString);
         return NULL;
@@ -64,7 +64,7 @@ char* java_to_char(JNIEnv *env, jstring string, jobject result) {
 jstring char_to_java(JNIEnv* env, const char* chars, jobject result) {
     size_t bytes = strlen(chars);
     wchar_t* wideString = (wchar_t*)malloc(sizeof(wchar_t) * (bytes+1));
-    if (mbstowcs(wideString, chars, bytes+1) < 0) {
+    if (mbstowcs(wideString, chars, bytes+1) == (size_t)-1) {
         mark_failed_with_message(env, "could not convert string from current locale", result);
         free(wideString);
         return NULL;