Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
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
wine
wine
Commits
65cab52a
Commit
65cab52a
authored
24 years ago
by
Jeremy White
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Adjusted to allow MFC compilation; prevent definition of struct fd_set
which conflicts with the fd_set typedef.
parent
58254446
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/winsock.h
+5
-2
5 additions, 2 deletions
include/winsock.h
with
5 additions
and
2 deletions
include/winsock.h
+
5
−
2
View file @
65cab52a
...
...
@@ -23,6 +23,7 @@
#include
<fcntl.h>
#include
<netdb.h>
#include
<sys/socket.h>
#include
<sys/ioctl.h>
#ifdef HAVE_IPX_GNU
# include <netipx/ipx.h>
...
...
@@ -91,12 +92,14 @@ typedef struct
SOCKET16
fd_array
[
FD_SETSIZE
];
/* an array of SOCKETs */
}
ws_fd_set16
;
typedef
struct
typedef
struct
ws_fd_set32_struct
{
UINT
fd_count
;
/* how many are SET? */
SOCKET
fd_array
[
FD_SETSIZE
];
/* an array of SOCKETs */
}
ws_fd_set32
;
/* ws_fd_set operations */
INT16
WINAPI
__WSAFDIsSet16
(
SOCKET16
,
ws_fd_set16
*
);
...
...
@@ -499,7 +502,7 @@ typedef struct sockaddr SOCKADDR, *PSOCKADDR, *LPSOCKADDR;
typedef
struct
sockaddr_in
SOCKADDR_IN
,
*
PSOCKADDR_IN
,
*
LPSOCKADDR_IN
;
typedef
struct
linger
LINGER
,
*
PLINGER
,
*
LPLINGER
;
typedef
struct
in_addr
IN_ADDR
,
*
PIN_ADDR
,
*
LPIN_ADDR
;
typedef
struct
fd_set
FD_SET
,
*
PFD_SET
,
*
LPFD_SET
;
typedef
struct
ws_
fd_set
32_struct
FD_SET
,
*
PFD_SET
,
*
LPFD_SET
;
typedef
struct
hostent
HOSTENT
,
*
PHOSTENT
,
*
LPHOSTENT
;
typedef
struct
servent
SERVENT
,
*
PSERVENT
,
*
LPSERVENT
;
typedef
struct
protoent
PROTOENT
,
*
PPROTOENT
,
*
LPPROTOENT
;
...
...
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