Merge branch 'js/compat-itimer'

Pieces to support compilation on __TANDEM.

* js/compat-itimer:
  Add a no-op setitimer() wrapper
This commit is contained in:
Junio C Hamano 2012-09-12 14:21:44 -07:00
Родитель e15f390b15 7f9e848cf8
Коммит 067a1f552e
2 изменённых файлов: 23 добавлений и 0 удалений

Просмотреть файл

@ -159,6 +159,11 @@ all::
# Define NO_PREAD if you have a problem with pread() system call (e.g. # Define NO_PREAD if you have a problem with pread() system call (e.g.
# cygwin1.dll before v1.5.22). # cygwin1.dll before v1.5.22).
# #
# Define NO_SETITIMER if you don't have setitimer()
#
# Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval
# This also implies NO_SETITIMER
#
# Define NO_THREAD_SAFE_PREAD if your pread() implementation is not # Define NO_THREAD_SAFE_PREAD if your pread() implementation is not
# thread-safe. (e.g. compat/pread.c or cygwin) # thread-safe. (e.g. compat/pread.c or cygwin)
# #
@ -1677,6 +1682,13 @@ endif
ifdef OBJECT_CREATION_USES_RENAMES ifdef OBJECT_CREATION_USES_RENAMES
COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1 COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
endif endif
ifdef NO_STRUCT_ITIMERVAL
COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
NO_SETITIMER=YesPlease
endif
ifdef NO_SETITIMER
COMPAT_CFLAGS += -DNO_SETITIMER
endif
ifdef NO_PREAD ifdef NO_PREAD
COMPAT_CFLAGS += -DNO_PREAD COMPAT_CFLAGS += -DNO_PREAD
COMPAT_OBJS += compat/pread.o COMPAT_OBJS += compat/pread.o

Просмотреть файл

@ -167,6 +167,17 @@
extern int compat_mkdir_wo_trailing_slash(const char*, mode_t); extern int compat_mkdir_wo_trailing_slash(const char*, mode_t);
#endif #endif
#ifdef NO_STRUCT_ITIMERVAL
struct itimerval {
struct timeval it_interval;
struct timeval it_value;
}
#endif
#ifdef NO_SETITIMER
#define setitimer(which,value,ovalue)
#endif
#ifndef NO_LIBGEN_H #ifndef NO_LIBGEN_H
#include <libgen.h> #include <libgen.h>
#else #else