Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
104307dd
You need to sign in or sign up before continuing.
Commit
104307dd
authored
Feb 15, 2017
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Xserver/os/: Drop not-used-anymore MNX_TCPCONN macro.
parent
7177caa7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
access.c
nx-X11/programs/Xserver/os/access.c
+8
-9
connection.c
nx-X11/programs/Xserver/os/connection.c
+1
-1
No files found.
nx-X11/programs/Xserver/os/access.c
View file @
104307dd
...
@@ -496,7 +496,7 @@ DefineSelf (int fd)
...
@@ -496,7 +496,7 @@ DefineSelf (int fd)
void
void
DefineSelf
(
int
fd
)
DefineSelf
(
int
fd
)
{
{
#if !defined(TCPCONN) && !defined(UNIXCONN)
&& !defined(MNX_TCPCONN)
#if !defined(TCPCONN) && !defined(UNIXCONN)
return
;
return
;
#else
#else
register
int
n
;
register
int
n
;
...
@@ -631,7 +631,7 @@ DefineLocalHost:
...
@@ -631,7 +631,7 @@ DefineLocalHost:
selfhosts
=
host
;
selfhosts
=
host
;
}
}
}
}
#endif
/* !TCPCONN && !UNIXCONN
&& !MNX_TCPCONN
*/
#endif
/* !TCPCONN && !UNIXCONN */
}
}
#else
#else
...
@@ -1070,11 +1070,10 @@ ResetHosts (char *display)
...
@@ -1070,11 +1070,10 @@ ResetHosts (char *display)
FILE
*
fd
;
FILE
*
fd
;
char
*
ptr
;
char
*
ptr
;
int
i
,
hostlen
;
int
i
,
hostlen
;
#if ((defined(TCPCONN) || defined(MNX_TCPCONN)) && \
#if (defined(TCPCONN) && (!defined(IPv6) || !defined(AF_INET6)))
(!defined(IPv6) || !defined(AF_INET6)))
union
{
union
{
struct
sockaddr
sa
;
struct
sockaddr
sa
;
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
struct
sockaddr_in
in
;
struct
sockaddr_in
in
;
#endif
/* TCPCONN */
#endif
/* TCPCONN */
}
saddr
;
}
saddr
;
...
@@ -1119,7 +1118,7 @@ ResetHosts (char *display)
...
@@ -1119,7 +1118,7 @@ ResetHosts (char *display)
NewHost
(
family
,
""
,
0
,
FALSE
);
NewHost
(
family
,
""
,
0
,
FALSE
);
LocalHostRequested
=
TRUE
;
/* Fix for XFree86 bug #156 */
LocalHostRequested
=
TRUE
;
/* Fix for XFree86 bug #156 */
}
}
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
else
if
(
!
strncmp
(
"inet:"
,
lhostname
,
5
))
else
if
(
!
strncmp
(
"inet:"
,
lhostname
,
5
))
{
{
family
=
FamilyInternet
;
family
=
FamilyInternet
;
...
@@ -1164,7 +1163,7 @@ ResetHosts (char *display)
...
@@ -1164,7 +1163,7 @@ ResetHosts (char *display)
}
}
else
else
#endif
/* SECURE_RPC */
#endif
/* SECURE_RPC */
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
{
{
#if defined(IPv6) && defined(AF_INET6)
#if defined(IPv6) && defined(AF_INET6)
if
(
(
family
==
FamilyInternet
)
||
(
family
==
FamilyInternet6
)
||
if
(
(
family
==
FamilyInternet
)
||
(
family
==
FamilyInternet6
)
||
...
@@ -1595,7 +1594,7 @@ CheckAddr (
...
@@ -1595,7 +1594,7 @@ CheckAddr (
switch
(
family
)
switch
(
family
)
{
{
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
case
FamilyInternet
:
case
FamilyInternet
:
if
(
length
==
sizeof
(
struct
in_addr
))
if
(
length
==
sizeof
(
struct
in_addr
))
len
=
length
;
len
=
length
;
...
@@ -1688,7 +1687,7 @@ ConvertAddr (
...
@@ -1688,7 +1687,7 @@ ConvertAddr (
case
AF_UNIX
:
case
AF_UNIX
:
#endif
#endif
return
FamilyLocal
;
return
FamilyLocal
;
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
case
AF_INET
:
case
AF_INET
:
#ifdef WIN32
#ifdef WIN32
if
(
16777343
==
*
(
long
*
)
&
((
struct
sockaddr_in
*
)
saddr
)
->
sin_addr
)
if
(
16777343
==
*
(
long
*
)
&
((
struct
sockaddr_in
*
)
saddr
)
->
sin_addr
)
...
...
nx-X11/programs/Xserver/os/connection.c
View file @
104307dd
...
@@ -549,7 +549,7 @@ AuthAudit (ClientPtr client, Bool letin,
...
@@ -549,7 +549,7 @@ AuthAudit (ClientPtr client, Bool letin,
#endif
#endif
strcpy
(
out
,
"local host"
);
strcpy
(
out
,
"local host"
);
break
;
break
;
#if defined(TCPCONN)
|| defined(MNX_TCPCONN)
#if defined(TCPCONN)
case
AF_INET
:
case
AF_INET
:
sprintf
(
out
,
"IP %s"
,
sprintf
(
out
,
"IP %s"
,
inet_ntoa
(((
struct
sockaddr_in
*
)
saddr
)
->
sin_addr
));
inet_ntoa
(((
struct
sockaddr_in
*
)
saddr
)
->
sin_addr
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment