Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glslang
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
deqp-deps
glslang
Commits
77d04598
Commit
77d04598
authored
6 years ago
by
St0fF
Browse files
Options
Downloads
Patches
Plain Diff
fix VS2012 compile issues
small fixes needed to compile under Win8.1/VS2012/static_lib
parent
b92ce60f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
glslang/Include/Common.h
+13
-12
13 additions, 12 deletions
glslang/Include/Common.h
glslang/MachineIndependent/Intermediate.cpp
+1
-0
1 addition, 0 deletions
glslang/MachineIndependent/Intermediate.cpp
with
14 additions
and
12 deletions
glslang/Include/Common.h
+
13
−
12
View file @
77d04598
...
...
@@ -67,18 +67,19 @@ std::string to_string(const T& val) {
#endif
#if defined(_MSC_VER) && _MSC_VER < 1800
inline
long
long
int
strtoll
(
const
char
*
str
,
char
**
endptr
,
int
base
)
{
return
_strtoi64
(
str
,
endptr
,
base
);
}
inline
unsigned
long
long
int
strtoull
(
const
char
*
str
,
char
**
endptr
,
int
base
)
{
return
_strtoui64
(
str
,
endptr
,
base
);
}
inline
long
long
int
atoll
(
const
char
*
str
)
{
return
strtoll
(
str
,
NULL
,
10
);
}
#include
<stdlib.h>
inline
long
long
int
strtoll
(
const
char
*
str
,
char
**
endptr
,
int
base
)
{
return
_strtoi64
(
str
,
endptr
,
base
);
}
inline
unsigned
long
long
int
strtoull
(
const
char
*
str
,
char
**
endptr
,
int
base
)
{
return
_strtoui64
(
str
,
endptr
,
base
);
}
inline
long
long
int
atoll
(
const
char
*
str
)
{
return
strtoll
(
str
,
NULL
,
10
);
}
#endif
#if defined(_MSC_VER)
...
...
This diff is collapsed.
Click to expand it.
glslang/MachineIndependent/Intermediate.cpp
+
1
−
0
View file @
77d04598
...
...
@@ -47,6 +47,7 @@
#include
<cfloat>
#include
<utility>
#include
<tuple>
namespace
glslang
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment