From 5219f332b486370d64a986fe4a56ff3a942a0b1a Mon Sep 17 00:00:00 2001 From: groogy Date: Wed, 3 Nov 2010 10:06:01 +0000 Subject: [PATCH] Changed name of System.* to main.* since I will otherwise have a big problem with file/name collision in other libraries. git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1597 4e206d99-4929-0410-ac5d-dfc041789085 --- ruby/sfml-system/system/Clock.cpp | 2 +- ruby/sfml-system/system/Vector2.cpp | 2 +- ruby/sfml-system/system/Vector3.cpp | 2 +- ruby/sfml-system/system/{System.cpp => main.cpp} | 2 +- ruby/sfml-system/system/{System.hpp => main.hpp} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename ruby/sfml-system/system/{System.cpp => main.cpp} (98%) rename ruby/sfml-system/system/{System.hpp => main.hpp} (91%) diff --git a/ruby/sfml-system/system/Clock.cpp b/ruby/sfml-system/system/Clock.cpp index 357862697..2a93a8da4 100644 --- a/ruby/sfml-system/system/Clock.cpp +++ b/ruby/sfml-system/system/Clock.cpp @@ -21,7 +21,7 @@ */ #include "Clock.hpp" -#include "System.hpp" +#include "main.hpp" #include /* Utility class for manipulating time. */ diff --git a/ruby/sfml-system/system/Vector2.cpp b/ruby/sfml-system/system/Vector2.cpp index 78cbb72c8..9cb96a2ca 100644 --- a/ruby/sfml-system/system/Vector2.cpp +++ b/ruby/sfml-system/system/Vector2.cpp @@ -21,7 +21,7 @@ */ #include "Vector2.hpp" -#include "System.hpp" +#include "main.hpp" /* SFML::Vector2 is a simple class that defines a mathematical vector with two coordinates (x and y). * diff --git a/ruby/sfml-system/system/Vector3.cpp b/ruby/sfml-system/system/Vector3.cpp index 95e62b98b..0778c76d7 100644 --- a/ruby/sfml-system/system/Vector3.cpp +++ b/ruby/sfml-system/system/Vector3.cpp @@ -21,7 +21,7 @@ */ #include "Vector3.hpp" -#include "System.hpp" +#include "main.hpp" /* SFML::Vector3 is a simple class that defines a mathematical vector with three coordinates (x, y and z). * diff --git a/ruby/sfml-system/system/System.cpp b/ruby/sfml-system/system/main.cpp similarity index 98% rename from ruby/sfml-system/system/System.cpp rename to ruby/sfml-system/system/main.cpp index 6536a0edb..cc68a108c 100644 --- a/ruby/sfml-system/system/System.cpp +++ b/ruby/sfml-system/system/main.cpp @@ -20,7 +20,7 @@ * source distribution. */ -#include "System.hpp" +#include "main.hpp" #include "Clock.hpp" #include "Vector2.hpp" #include "Vector3.hpp" diff --git a/ruby/sfml-system/system/System.hpp b/ruby/sfml-system/system/main.hpp similarity index 91% rename from ruby/sfml-system/system/System.hpp rename to ruby/sfml-system/system/main.hpp index c2bf7b1cc..fbfd888af 100644 --- a/ruby/sfml-system/system/System.hpp +++ b/ruby/sfml-system/system/main.hpp @@ -20,8 +20,8 @@ * source distribution. */ -#ifndef SFML_RUBYEXT_SYSTEM_HEADER_ -#define SFML_RUBYEXT_SYSTEM_HEADER_ +#ifndef SFML_RUBYEXT_MAIN_HEADER_ +#define SFML_RUBYEXT_MAIN_HEADER_ #include "ruby.h" @@ -34,4 +34,4 @@ typedef VALUE ( *RubyFunctionPtr )( ... ); #define FUNCPTR( x ) ( reinterpret_cast< RubyFunctionPtr >( x ) ) -#endif // SFML_RUBYEXT_SYSTEM_HEADER_ +#endif // SFML_RUBYEXT_MAIN_HEADER_