Skip to content

Working hlslparser #1

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
zz85 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Working hlslparser #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94f97b4
Remove unknown header files (probably specific to The Witness engine)
zz85 Feb 13, 2015
78cb2eb
Make Log_ErrorArgList work
zz85 Feb 13, 2015
738677b
Use stdlib.h for malloc
zz85 Feb 13, 2015
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
6 changes: 1 addition & 5 deletions src/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
#include <string.h> // strcmp, strcasecmp
#include <stdlib.h> // strtod, strtol

#include "gamelib_render.h"
#include "log_manager.h"


namespace M4 {

// Engine/String.cpp
Expand Down Expand Up @@ -86,7 +82,7 @@ void Log_Error(const char * format, ...) {
}

void Log_ErrorArgList(const char * format, va_list args) {
Log::print_valist(format, args);
vprintf(format, args);
}


Expand Down
2 changes: 1 addition & 1 deletion src/Engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define ENGINE_H

#include <stdarg.h> // va_list, vsnprintf
#include <malloc.h> // malloc
#include <stdlib.h> // malloc
#include <new> // for placement new

#ifndef NULL
Expand Down