Skip to content

Commit 7798034

Browse files
committed
Revert "compat/posix: introduce writev(3p) wrapper"
This reverts commit 3b9b2c2; let's not use writev() for now.
1 parent dc1b8b2 commit 7798034

File tree

5 files changed

+0
-65
lines changed

5 files changed

+0
-65
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,10 +2029,6 @@ ifdef NO_PREAD
20292029
COMPAT_CFLAGS += -DNO_PREAD
20302030
COMPAT_OBJS += compat/pread.o
20312031
endif
2032-
ifdef NO_WRITEV
2033-
COMPAT_CFLAGS += -DNO_WRITEV
2034-
COMPAT_OBJS += compat/writev.o
2035-
endif
20362032
ifdef NO_FAST_WORKING_DIRECTORY
20372033
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
20382034
endif

compat/posix.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
#include <sys/socket.h>
138138
#include <sys/ioctl.h>
139139
#include <sys/statvfs.h>
140-
#ifndef NO_WRITEV
141-
#include <sys/uio.h>
142-
#endif
143140
#include <termios.h>
144141
#ifndef NO_SYS_SELECT_H
145142
#include <sys/select.h>
@@ -326,17 +323,6 @@ int git_lstat(const char *, struct stat *);
326323
ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
327324
#endif
328325

329-
#ifdef NO_WRITEV
330-
#define writev git_writev
331-
#define iovec git_iovec
332-
struct git_iovec {
333-
void *iov_base;
334-
size_t iov_len;
335-
};
336-
337-
ssize_t git_writev(int fd, const struct iovec *iov, int iovcnt);
338-
#endif
339-
340326
#ifdef NO_SETENV
341327
#define setenv gitsetenv
342328
int gitsetenv(const char *, const char *, int);

compat/writev.c

Lines changed: 0 additions & 44 deletions
This file was deleted.

config.mak.uname

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ ifeq ($(uname_S),Windows)
459459
SANE_TOOL_PATH ?= $(msvc_bin_dir_msys)
460460
HAVE_ALLOCA_H = YesPlease
461461
NO_PREAD = YesPlease
462-
NO_WRITEV = YesPlease
463462
NEEDS_CRYPTO_WITH_SSL = YesPlease
464463
NO_LIBGEN_H = YesPlease
465464
NO_POLL = YesPlease
@@ -675,7 +674,6 @@ ifeq ($(uname_S),MINGW)
675674
pathsep = ;
676675
HAVE_ALLOCA_H = YesPlease
677676
NO_PREAD = YesPlease
678-
NO_WRITEV = YesPlease
679677
NEEDS_CRYPTO_WITH_SSL = YesPlease
680678
NO_LIBGEN_H = YesPlease
681679
NO_POLL = YesPlease

meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,6 @@ checkfuncs = {
14291429
'initgroups' : [],
14301430
'strtoumax' : ['strtoumax.c', 'strtoimax.c'],
14311431
'pread' : ['pread.c'],
1432-
'writev' : ['writev.c'],
14331432
}
14341433

14351434
if host_machine.system() == 'windows'

0 commit comments

Comments
 (0)