Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
ed70675d
Commit
ed70675d
authored
4 years ago
by
Monster Iestyn
Browse files
Options
Downloads
Patches
Plain Diff
added some helpful comments, remove duplicate code
parent
b8a794e3
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1063
What is a standard
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/i_tcp.c
+1
-0
1 addition, 0 deletions
src/i_tcp.c
src/mserv.c
+4
-4
4 additions, 4 deletions
src/mserv.c
with
5 additions
and
4 deletions
src/i_tcp.c
+
1
−
0
View file @
ed70675d
...
...
@@ -183,6 +183,7 @@
#endif
#ifndef NONET
// define socklen_t in DOS/Windows if it is not already defined
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
typedef
int
socklen_t
;
#endif
...
...
This diff is collapsed.
Click to expand it.
src/mserv.c
+
4
−
4
View file @
ed70675d
...
...
@@ -26,9 +26,11 @@
#define HAVE_IPV6
#endif
// -- Monster Iestyn 12/07/20
// define Winsock related macros like in i_tcp.c (this is really all for socklen_t tbh)
#ifdef _WIN32
#define USE_WINSOCK
#if
/*defined (_WIN64) ||*/
defined (HAVE_IPV6)
#if
/*defined (_WIN64) ||*/
defined (HAVE_IPV6)
// (to be consistent with below code)
#define USE_WINSOCK2
#else //_WIN64/HAVE_IPV6
#define USE_WINSOCK1
...
...
@@ -36,9 +38,6 @@
#endif //WIN32 OS
#ifndef NONET
#ifndef NO_IPV6
#define HAVE_IPV6
#endif
#ifdef _WIN32
#define RPC_NO_WINDOWS_H
#ifdef HAVE_IPV6
...
...
@@ -210,6 +209,7 @@ UINT16 current_port = 0;
#endif
#ifndef NONET
// define socklen_t in DOS/Windows if it is not already defined
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
typedef
int
socklen_t
;
#endif
...
...
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