From 2f4e9acf95114b76c0ec84ab85445cff3b5cb1e3 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 28 Jan 2019 22:20:40 +0000 Subject: Fix for [f559bbde4e] (even though that's not really a bug) --- compat/unistd.h | 76 ---------------------------------------------------- unix/tclEpollNotfy.c | 1 - unix/tclUnixPort.h | 6 +---- win/tcl.dsp | 4 --- 4 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 compat/unistd.h diff --git a/compat/unistd.h b/compat/unistd.h deleted file mode 100644 index a8f14f2..0000000 --- a/compat/unistd.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * unistd.h -- - * - * Macros, constants and prototypes for Posix conformance. - * - * Copyright 1989 Regents of the University of California Permission to use, - * copy, modify, and distribute this software and its documentation for any - * purpose and without fee is hereby granted, provided that the above - * copyright notice appear in all copies. The University of California makes - * no representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - */ - -#ifndef _UNISTD -#define _UNISTD - -#include - -#ifndef NULL -#define NULL 0 -#endif - -/* - * Strict POSIX stuff goes here. Extensions go down below, in the ifndef - * _POSIX_SOURCE section. - */ - -extern void _exit(int status); -extern int access(const char *path, int mode); -extern int chdir(const char *path); -extern int chown(const char *path, uid_t owner, gid_t group); -extern int close(int fd); -extern int dup(int oldfd); -extern int dup2(int oldfd, int newfd); -extern int execl(const char *path, ...); -extern int execle(const char *path, ...); -extern int execlp(const char *file, ...); -extern int execv(const char *path, char **argv); -extern int execve(const char *path, char **argv, char **envp); -extern int execvpw(const char *file, char **argv); -extern pid_t fork(void); -extern char * getcwd(char *buf, size_t size); -extern gid_t getegid(void); -extern uid_t geteuid(void); -extern gid_t getgid(void); -extern int getgroups(int bufSize, int *buffer); -extern pid_t getpid(void); -extern uid_t getuid(void); -extern int isatty(int fd); -extern long lseek(int fd, long offset, int whence); -extern int pipe(int *fildes); -extern int read(int fd, char *buf, size_t size); -extern int setgid(gid_t group); -extern int setuid(uid_t user); -extern unsigned sleep(unsigned seconds); -extern char * ttyname(int fd); -extern int unlink(const char *path); -extern int write(int fd, const char *buf, size_t size); - -#ifndef _POSIX_SOURCE -extern char * crypt(const char *, const char *); -extern int fchown(int fd, uid_t owner, gid_t group); -extern int flock(int fd, int operation); -extern int ftruncate(int fd, unsigned long length); -extern int ioctl(int fd, int request, ...); -extern int readlink(const char *path, char *buf, int bufsize); -extern int setegid(gid_t group); -extern int seteuidw(uid_t user); -extern int setreuid(int ruid, int euid); -extern int symlink(const char *, const char *); -extern int ttyslot(void); -extern int truncate(const char *path, unsigned long length); -extern int vfork(void); -#endif /* _POSIX_SOURCE */ - -#endif /* _UNISTD */ diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c index 7a5e09d..4961ef5 100644 --- a/unix/tclEpollNotfy.c +++ b/unix/tclEpollNotfy.c @@ -24,7 +24,6 @@ #include #endif /* HAVE_EVENTFD */ #include -#include /* * This structure is used to keep track of the notifier info for a registered diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 57853c4..c982585 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -156,11 +156,7 @@ typedef off_t Tcl_SeekOffset; #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_UNISTD_H -# include -#else -# include "../compat/unistd.h" -#endif +#include MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); diff --git a/win/tcl.dsp b/win/tcl.dsp index bdec59e..eae1681 100644 --- a/win/tcl.dsp +++ b/win/tcl.dsp @@ -204,10 +204,6 @@ SOURCE=..\compat\tclErrno.h # End Source File # Begin Source File -SOURCE=..\compat\unistd.h -# End Source File -# Begin Source File - SOURCE=..\compat\waitpid.c # End Source File # End Group -- cgit v0.12