[Ika-commits] SF.net SVN: ika:[718] trunk/common

[<slu...@us...>]

Revision: 718
          http://ika.svn.sourceforge.net/ika/?rev=718&view=rev
Author:   sluimers
Date:     2010-02-15 10:02:35 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Linux bug fixes. First time I ever commit something to ika, so if anything goes wrong please tell me.

Modified Paths:
--------------
    trunk/common/Canvas.cpp
    trunk/common/chr.cpp
    trunk/common/fileio.cpp
    trunk/common/fontfile.cpp
    trunk/common/log.cpp
    trunk/common/vsp.cpp

Modified: trunk/common/Canvas.cpp
===================================================================
--- trunk/common/Canvas.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/Canvas.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -1,4 +1,6 @@
-
+#ifdef linux
+#include <string.h>
+#endif
 #include <sstream>
 #include <stdexcept>
 

Modified: trunk/common/chr.cpp
===================================================================
--- trunk/common/chr.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/chr.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -1,3 +1,6 @@
+#ifdef linux
+#include <string.h>
+#endif
 #include <cassert>
 #include <cstdlib>
 #include <fstream>

Modified: trunk/common/fileio.cpp
===================================================================
--- trunk/common/fileio.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/fileio.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -1,3 +1,6 @@
+#ifdef linux
+#include <string.h>
+#endif
 #include "fileio.h"
 #include "zlib.h"
 #include <stdio.h>

Modified: trunk/common/fontfile.cpp
===================================================================
--- trunk/common/fontfile.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/fontfile.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -1,3 +1,7 @@
+#ifdef linux
+#include <string.h>
+#include <memory>
+#endif
 #include <limits>
 
 #include "fontfile.h"

Modified: trunk/common/log.cpp
===================================================================
--- trunk/common/log.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/log.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -59,7 +59,7 @@
 
 #elif defined(__GNUC__)
     char* buffer = 0;
-    int len = asprintf(&buffer, s, lst);
+    int len = vasprintf(&buffer, s, lst);
 
     if (len == -1) {
         logFile << "Log system error: Unable to write some stuff.";
@@ -95,7 +95,7 @@
 
 #elif defined(__GNUC__)
     char* buffer = 0;
-    int len = asprintf(&buffer, s, lst);
+    int len = vasprintf(&buffer, s, lst);
 
     if (len == -1) {
         logFile << "Log system error: Unable to write some stuff.";

Modified: trunk/common/vsp.cpp
===================================================================
--- trunk/common/vsp.cpp	2010-01-27 06:40:51 UTC (rev 717)
+++ trunk/common/vsp.cpp	2010-02-15 10:02:35 UTC (rev 718)
@@ -1,4 +1,8 @@
 // VSP.cpp
+#ifdef linux
+#include <string.h>
+#endif
+
 #include <cassert>
 #include <stdio.h>
 #include "vsp.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.