Skip to content

Commit

Permalink
Fix duplicate definitions in Mavericks
Browse files Browse the repository at this point in the history
  • Loading branch information
@trondd555
trondd555 committed Mar 12, 2014
1 parent 0864f6c commit f6c7ce1
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions linux/util.h
View file
Expand Up @@ -20,8 +20,12 @@
#define FPARSELN_UNESCREST 0x08
#define FPARSELN_UNESCALL 0x0f

#if !__has_builtin(strlcpy)
size_t strlcpy(char *, const char *, size_t);
#endif
#if !__has_builtin(strlcat)
size_t strlcat(char *, const char *, size_t);
#endif

char *fgetln(FILE *, size_t *);
char *fparseln(FILE *, size_t *, size_t *, const char [3], int);
Expand Down

2 comments on commit f6c7ce1

@sysfu
Copy link

@sysfu sysfu commented on f6c7ce1 Mar 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit broke the build on linux. I noticed that the comment says it was for duplicate definitions in OS X Mavericks. Did this accidentally get written into the wrong directory? Who accepted the pull request?

@jcvernaleo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sysfu I accepted this pull request. At the time I accepted it, the OSX build files where just symlinks to the linux ones. I have made them separate files since then. I can remove those lines from the linux version of the file, but I really would like more info first. This builds fine on my Linux machine (Ubuntu 12.04). Please reply with some more info (on the issue you opened would be best).

Please sign in to comment.