projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9ac73d
)
[CDMAKE]
author
Alex Ionescu
<aionescu@gmail.com>
Wed, 9 Sep 2015 04:58:25 +0000
(
04:58
+0000)
committer
Alex Ionescu
<aionescu@gmail.com>
Wed, 9 Sep 2015 04:58:25 +0000
(
04:58
+0000)
- Fix Build on VS2015
svn path=/trunk/; revision=69141
reactos/tools/cdmake/cdmake.c
patch
|
blob
|
history
diff --git
a/reactos/tools/cdmake/cdmake.c
b/reactos/tools/cdmake/cdmake.c
index
5fcaaf6
..
d94dabe
100644
(file)
--- a/
reactos/tools/cdmake/cdmake.c
+++ b/
reactos/tools/cdmake/cdmake.c
@@
-1851,6
+1851,7
@@
static char HELP[] =
Program execution starts here.
-----------------------------------------------------------------------------*/
+#if (defined(__GNUC__) || (_MSC_VER < 1900))
char* strtok_s(char *str, const char *delim, char **ctx)
{
if (delim == NULL || ctx == NULL || (str == NULL && *ctx == NULL))
@@
-1874,6
+1875,7
@@
char* strtok_s(char *str, const char *delim, char **ctx)
return str;
}
+#endif
int main(int argc, char **argv)
{