Fix some FTBFS issues when compiling with GCC 4.3

[synfig.git] / synfig-studio / trunk / src / synfigapp / settings.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/settings.cpp b/synfig-studio/trunk/src/synfigapp/settings.cpp
index de2c708..5399109 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/settings.cpp
+++ b/synfig-studio/trunk/src/synfigapp/settings.cpp
@@ -32,9 +32,12 @@
 
 #include <fstream>
 #include <iostream>
+#include <algorithm>
 #include "settings.h"
 #include <synfig/general.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -247,7 +250,7 @@ Settings::load_from_file(const synfig::String& filename)
                        }
                        catch(...)
                        {
-                               synfig::error("Settings::load_from_file(): Attept to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
+                               synfig::error("Settings::load_from_file(): Attempt to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
                                throw;
                        }
                }