Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
18f51b34
Commit
18f51b34
authored
9 years ago
by
Alam Ed Arias
Browse files
Options
Downloads
Patches
Plain Diff
build: more mac fixes
parent
2165c680
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+2
-0
2 additions, 0 deletions
.travis.yml
src/md5.c
+1
-1
1 addition, 1 deletion
src/md5.c
src/string.c
+4
-0
4 additions, 0 deletions
src/string.c
with
7 additions
and
1 deletion
.travis.yml
+
2
−
0
View file @
18f51b34
...
...
@@ -4,7 +4,9 @@ dist: trusty
os
:
-
linux
env
:
CFLAGS=-Wno-absolute-value -Werror
-
osx
env
:
CFLAGS=--Werror
env
:
-
CFLAGS=-Wno-absolute-value -Wno-unknown-warning-option -Werror
...
...
This diff is collapsed.
Click to expand it.
src/md5.c
+
1
−
1
View file @
18f51b34
...
...
@@ -36,7 +36,7 @@
#include
<stdlib.h>
#else
#ifndef HAVE_MEMCPY
#if !((defined (_WIN32) || defined (_WIN32_WCE)) && !defined (__CYGWIN__))
#if !((defined (_WIN32) || defined (_WIN32_WCE)) && !defined (__CYGWIN__))
&& !defined (__APPLE__)
#define memcpy(d, s, n) bcopy ((s), (d), (n))
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
src/string.c
+
4
−
0
View file @
18f51b34
...
...
@@ -15,6 +15,8 @@
#include
<string.h>
#include
"doomdef.h"
#if !defined (__APPLE__)
// Like the OpenBSD version, but it doesn't check for src not being a valid
// C string.
size_t
strlcat
(
char
*
dst
,
const
char
*
src
,
size_t
siz
)
...
...
@@ -46,3 +48,5 @@ size_t strlcpy(char *dst, const char *src, size_t siz)
dst
[
0
]
=
'\0'
;
return
strlcat
(
dst
,
src
,
siz
);
}
#endif
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