From 09b33c7ff0a0ebb57321aba15d56028b1a03bd7b Mon Sep 17 00:00:00 2001
From: MovingtoMars <liam@bumblebee.net.nz>
Date: Sun, 18 Jan 2015 12:05:21 +1300
Subject: [PATCH 1/2] Fix logging on Windows

---
 toxcore/logger.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/toxcore/logger.c b/toxcore/logger.c
index ad0423fc..3caf6fb4 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -37,8 +37,10 @@
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #   define getpid() ((unsigned) GetCurrentProcessId())
 #   define SFILE(FILE__M) (strrchr(FILE__M, '\\') ? strrchr(FILE__M, '\\') + 1 : FILE__M)
+#   define WIN_CR "\r"
 #else
 #   define SFILE(FILE__M) (strrchr(FILE__M, '/') ? strrchr(FILE__M, '/') + 1 : FILE__M)
+#   define WIN_CR ""
 #endif
 
 
@@ -100,7 +102,7 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
     }
 
     if (!(retu->log_file = fopen(file_name, "ab"))) {
-        fprintf(stderr, "Error opening logger file: %s; info: %s\n", file_name, strerror(errno));
+        fprintf(stderr, "Error opening logger file: %s; info: %s" WIN_CR "\n", file_name, strerror(errno));
         free(retu);
         pthread_mutex_destroy(retu->mutex);
         return NULL;
@@ -126,13 +128,13 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
     retu->level = level;
     retu->start_time = current_time_monotonic();
 
-    fprintf(retu->log_file, "Successfully created and running logger id: %s; time: %s\n",
+    fprintf(retu->log_file, "Successfully created and running logger id: %s; time: %s" WIN_CR "\n",
             retu->id, strtime(retu->tstr, 16));
 
     return retu;
 
 FAILURE:
-    fprintf(stderr, "Failed to create logger!\n");
+    fprintf(stderr, "Failed to create logger!" WIN_CR "\n");
     pthread_mutex_destroy(retu->mutex);
     fclose(retu->log_file);
     free(retu->tstr);
@@ -204,7 +206,7 @@ void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, con
         "%-5s  " /* Logger lever string */
         "%-20s " /* File:line string */
         "- %s"   /* Output message */
-        "\n";    /* Every new print new line */
+        WIN_CR "\n";    /* Every new print new line */
 
 
     Logger *this_log = log ? log : global;

From b1887414a998b68aa199c04d03c5734a183b6d75 Mon Sep 17 00:00:00 2001
From: MovingtoMars <liam@bumblebee.net.nz>
Date: Sun, 18 Jan 2015 12:14:31 +1300
Subject: [PATCH 2/2] Add 2015 to copyright notice

---
 toxcore/logger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toxcore/logger.c b/toxcore/logger.c
index 3caf6fb4..e8aef7e0 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -1,6 +1,6 @@
 /*  logger.c
  *
- *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *  Copyright (C) 2013, 2015 Tox project All Rights Reserved.
  *
  *  This file is part of Tox.
  *