makedep: No longer use wine/port.h.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-12-01 10:25:17 +01:00
parent c8edeb132d
commit 0b9963ad34
2 changed files with 8 additions and 16 deletions

View File

@ -165,8 +165,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
* Function definitions (only when using libwine_port) * Function definitions (only when using libwine_port)
*/ */
#ifndef NO_LIBWINE_PORT
#ifndef HAVE_GETOPT_LONG_ONLY #ifndef HAVE_GETOPT_LONG_ONLY
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -230,16 +228,4 @@ int symlink(const char *from, const char *to);
extern int mkstemps(char *template, int suffix_len); extern int mkstemps(char *template, int suffix_len);
#else /* NO_LIBWINE_PORT */
#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable
#define getopt_long __WINE_NOT_PORTABLE(getopt_long)
#define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only)
#define lstat __WINE_NOT_PORTABLE(lstat)
#define pread __WINE_NOT_PORTABLE(pread)
#define pwrite __WINE_NOT_PORTABLE(pwrite)
#endif /* NO_LIBWINE_PORT */
#endif /* !defined(__WINE_WINE_PORT_H) */ #endif /* !defined(__WINE_WINE_PORT_H) */

View File

@ -19,20 +19,26 @@
*/ */
#include "config.h" #include "config.h"
#define NO_LIBWINE_PORT
#include "wine/port.h"
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <direct.h>
#include <io.h>
#define mkdir(path,mode) mkdir(path)
#endif
#include "wine/list.h" #include "wine/list.h"
struct strarray struct strarray