Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
07dd5a7e
Commit
07dd5a7e
authored
19 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Attempt at a better fix for the winsock.h problems on Darwin.
parent
85ecdd30
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/wine/test.h
+4
-1
4 additions, 1 deletion
include/wine/test.h
include/winsock.h
+14
-0
14 additions, 0 deletions
include/winsock.h
with
18 additions
and
1 deletion
include/wine/test.h
+
4
−
1
View file @
07dd5a7e
...
...
@@ -21,7 +21,10 @@
#ifndef __WINE_TEST_H
#define __WINE_TEST_H
#include
<windows.h>
#include
<stdarg.h>
#include
<stdlib.h>
#include
<windef.h>
#include
<winbase.h>
/* debug level */
extern
int
winetest_debug
;
...
...
This diff is collapsed.
Click to expand it.
include/winsock.h
+
14
−
0
View file @
07dd5a7e
...
...
@@ -56,6 +56,20 @@
# define FD_ISSET Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# define fd_set Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# define select Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# elif defined(RLIM_INFINITY)
/* On Darwin stdlib.h includes sys/resource.h which defines timeval but not the fd_set macros */
# define fd_set unix_fd_set
# include <sys/types.h>
# include <time.h>
# include <stdlib.h>
# undef fd_set
# undef FD_SETSIZE
# undef FD_CLR
# undef FD_SET
# undef FD_ZERO
# undef FD_ISSET
# define select Include_winsock_h_before_sys_types_h_or_use_the_MSVCRT_library
# define timeval Include_winsock_h_before_sys_types_h_or_use_the_MSVCRT_library
# else
/* FD_CLR */
/* stdlib.h has not been included yet so it's not too late. Include it now
* making sure that none of the select symbols is affected. Then we can
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment