mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-24 21:01:17 +00:00
Applied patch for IPv6 support under Solaris8 from Florent Parent.
This commit is contained in:
parent
35e0293824
commit
87aa047299
4 changed files with 8 additions and 8 deletions
|
@ -50,7 +50,6 @@ struct qsockaddr
|
||||||
unsigned char sa_data[14];
|
unsigned char sa_data[14];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
typedef unsigned int u_int32_t;
|
typedef unsigned int u_int32_t;
|
||||||
|
|
|
@ -91,12 +91,6 @@
|
||||||
#define MAXHOSTNAMELEN 512
|
#define MAXHOSTNAMELEN 512
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __sun__
|
|
||||||
#define s6_addr32 _S6_un._S6_u32
|
|
||||||
#define ss_family __ss_family
|
|
||||||
#define ss_len __ss_len
|
|
||||||
#endif __sun__
|
|
||||||
|
|
||||||
#ifdef __GLIBC__ // glibc macro
|
#ifdef __GLIBC__ // glibc macro
|
||||||
#define s6_addr32 in6_u.u6_addr32
|
#define s6_addr32 in6_u.u6_addr32
|
||||||
#define ss_family __ss_family
|
#define ss_family __ss_family
|
||||||
|
|
|
@ -837,7 +837,9 @@ dnl check for X11 video driver
|
||||||
AC_MSG_CHECKING(for X11 video driver)
|
AC_MSG_CHECKING(for X11 video driver)
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
*-solaris*)
|
*-solaris*)
|
||||||
X11_VID_SRC="vid_sunx.c" ;;
|
X11_VID_SRC="vid_sunx.c"
|
||||||
|
LIBS="$LIBS -lsocket -lnsl"
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
if test "x$HAS_X11"; then
|
if test "x$HAS_X11"; then
|
||||||
X11_VID_SRC="vid_x11.c";
|
X11_VID_SRC="vid_x11.c";
|
||||||
|
|
|
@ -37,6 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
|
||||||
|
#ifdef __sun__
|
||||||
|
/* Get definition of SIOCGIFCONF used in grab_myaddr() */
|
||||||
|
#include <sys/sockio.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||||
#define model_t quakeforgemodel_t
|
#define model_t quakeforgemodel_t
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue