From 20a8fc9d5b2136795a7cac36e83cb0d9f87a56b4 Mon Sep 17 00:00:00 2001 From: memoryleakno1 Date: Wed, 15 Mar 2017 21:19:19 +0100 Subject: [PATCH 1/2] Fixed include directives in exampels. Addes missing unsitd.h --- examples/Demo2/Pyramid.cc | 4 ++-- examples/Demo2/demo2.cc | 8 ++++---- include/FLConsole/FLConsole.h | 4 ++-- include/TextConsole/TextConsole.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/Demo2/Pyramid.cc b/examples/Demo2/Pyramid.cc index a9451b4..db69c66 100644 --- a/examples/Demo2/Pyramid.cc +++ b/examples/Demo2/Pyramid.cc @@ -1,6 +1,6 @@ -#include -#include +#include +#include #include "Pyramid.h" /** diff --git a/examples/Demo2/demo2.cc b/examples/Demo2/demo2.cc index a36bb1f..799ea8f 100644 --- a/examples/Demo2/demo2.cc +++ b/examples/Demo2/demo2.cc @@ -2,12 +2,12 @@ #include #include #include - -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/include/FLConsole/FLConsole.h b/include/FLConsole/FLConsole.h index 8d84815..1b62ee7 100644 --- a/include/FLConsole/FLConsole.h +++ b/include/FLConsole/FLConsole.h @@ -9,8 +9,8 @@ #ifndef __FLCONSOLE_H__ #define __FLCONSOLE_H__ -#include -#include +#include +#include //#include diff --git a/include/TextConsole/TextConsole.h b/include/TextConsole/TextConsole.h index d84d6dd..cbec9d1 100644 --- a/include/TextConsole/TextConsole.h +++ b/include/TextConsole/TextConsole.h @@ -9,8 +9,8 @@ #ifndef __TEXT_CONSOLE_H__ #define __TEXT_CONSOLE_H__ -#include -#include +#include +#include #include #include From 4e0fbc66d14f1146505dfac60029cf0938098447 Mon Sep 17 00:00:00 2001 From: memoryleakno1 Date: Wed, 15 Mar 2017 21:28:16 +0100 Subject: [PATCH 2/2] Enclosed unistd.h with proper ifdefs for unix --- examples/Demo2/demo2.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/Demo2/demo2.cc b/examples/Demo2/demo2.cc index 799ea8f..7441ea0 100644 --- a/examples/Demo2/demo2.cc +++ b/examples/Demo2/demo2.cc @@ -2,7 +2,6 @@ #include #include #include -#include #include #include @@ -12,6 +11,10 @@ #include #include +#ifdef __unix__ +#include /* needed for usleep */ +#endif + #include "Pyramid.h" // Single global instance so glut can get access