Skip to content

Commit d36376a

Browse files
committed
fixup??? Win32: implement readlink()
Another merge conflict resolution not recorded by `git rerere`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 0ea4d89 commit d36376a

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

compat/mingw-posix.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ struct utsname {
120120
* trivial stubs
121121
*/
122122

123-
static inline int readlink(const char *path UNUSED, char *buf UNUSED, size_t bufsiz UNUSED)
124-
{ errno = ENOSYS; return -1; }
125123
static inline int symlink(const char *oldpath UNUSED, const char *newpath UNUSED)
126124
{ errno = ENOSYS; return -1; }
127125
static inline int fchmod(int fildes UNUSED, mode_t mode UNUSED)
@@ -196,6 +194,7 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
196194
int sigaction(int sig, struct sigaction *in, struct sigaction *out);
197195
int link(const char *oldpath, const char *newpath);
198196
int uname(struct utsname *buf);
197+
int readlink(const char *path, char *buf, size_t bufsiz);
199198

200199
/*
201200
* replacements of existing functions

0 commit comments

Comments
 (0)