Skip to content

Fixed include directives in exampels. Addes missing unistd.h #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memoryleakno1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed include directives in exampels. Addes missing unistd.h #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a8fc9
Fixed include directives in exampels. Addes missing unsitd.h
Mar 15, 2017
4e0fbc6
Enclosed unistd.h with proper ifdefs for unix
Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/Demo2/Pyramid.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#include <CVars/CVar.h>
#include <CVars/glplatform.h>
#include <cvars/CVar.h>
#include <cvars/glplatform.h>
#include "Pyramid.h"

/**
Expand Down
11 changes: 7 additions & 4 deletions examples/Demo2/demo2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
#include <stdio.h>
#include <math.h>
#include <stdlib.h>

#include <CVars/glplatform.h>
#include <cvars/glplatform.h>
#include <GLConsole/GLConsole.h>

#include <CVars/CVarVectorIO.h>
#include <CVars/CVarMapIO.h>
#include <cvars/CVarVectorIO.h>
#include <cvars/CVarMapIO.h>

#include <vector>
#include <map>

#ifdef __unix__
#include <unistd.h> /* needed for usleep */
#endif

#include "Pyramid.h"

// Single global instance so glut can get access
Expand Down
4 changes: 2 additions & 2 deletions include/FLConsole/FLConsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef __FLCONSOLE_H__
#define __FLCONSOLE_H__

#include <CVars/CVar.h>
#include <CVars/Timestamp.h>
#include <cvars/CVar.h>
#include <cvars/Timestamp.h>

//#include <GLConsole/CVarUtils::Color.h>

Expand Down
4 changes: 2 additions & 2 deletions include/TextConsole/TextConsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef __TEXT_CONSOLE_H__
#define __TEXT_CONSOLE_H__

#include <CVars/CVar.h>
#include <CVars/Timestamp.h>
#include <cvars/CVar.h>
#include <cvars/Timestamp.h>

#include <limits.h>
#include <stdio.h>
Expand Down