From d3deeacc305a7662135fc44ba101351cb3d56fb2 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 7 Feb 2009 10:56:44 +0000
Subject: [PATCH] Tidy up Platform.hpp

---
 src/Font.hpp     |  4 ++++
 src/Makefile.am  |  2 +-
 src/Platform.hpp | 19 ++++---------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Font.hpp b/src/Font.hpp
index 561efbb..321171d 100644
--- a/src/Font.hpp
+++ b/src/Font.hpp
@@ -22,6 +22,10 @@
 
 #include "Platform.hpp"
 
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+
 class Font {
 public:
    Font(string filename, unsigned int h);
diff --git a/src/Makefile.am b/src/Makefile.am
index 9addefa..2e1ac72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,4 +22,4 @@ localedir = $(datadir)/locale
 
 # Add -DSHOW_FPS here to show FPS in title bar
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLINUX -DUNIX \
-	-DDATADIR=\"$(pkgdatadir)\" -DSHOW_FPS @DEFS@
+	-DDATADIR=\"$(pkgdatadir)\" @DEFS@
diff --git a/src/Platform.hpp b/src/Platform.hpp
index faf2a56..1bf8648 100644
--- a/src/Platform.hpp
+++ b/src/Platform.hpp
@@ -1,6 +1,6 @@
 //
-// Platform.hpp - Platform specific includes.
-// Copyright (C) 2006  Nick Gasson
+// Platform.hpp -- Platform specific includes.
+// Copyright (C) 2006-2009  Nick Gasson
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,15 +20,7 @@
 #ifndef INC_PLATFORM_HPP
 #define INC_PLATFORM_HPP
 
-#include <stdio.h>
-#include <memory.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-#include <time.h>
-#include <assert.h>
-#include <stddef.h>
-
+#include <cassert>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -38,10 +30,7 @@
 #include <fstream>
 #include <map>
 #include <algorithm>
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
+#include <cmath>
 
 using namespace std;
 
-- 
2.39.2