From f1ec3f9804397b4cd8b8f772e14d23218d814529 Mon Sep 17 00:00:00 2001 From: Mark Tempel Date: Fri, 16 Jan 2004 04:42:06 +0000 Subject: [PATCH 1/1] Update finger to build again. svn path=/trunk/; revision=7672 --- rosapps/net/finger/makefile | 2 ++ rosapps/net/finger/various.h | 25 ++----------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/rosapps/net/finger/makefile b/rosapps/net/finger/makefile index a23770ee563..4cb26ca3c96 100644 --- a/rosapps/net/finger/makefile +++ b/rosapps/net/finger/makefile @@ -9,6 +9,8 @@ TARGET_NAME = finger TARGET_SDKLIBS = ws2_32.a +TARGET_CFLAGS = -D__USE_W32_SOCKETS + TARGET_OBJECTS = $(TARGET_NAME).o \ err.o \ getopt.o \ diff --git a/rosapps/net/finger/various.h b/rosapps/net/finger/various.h index f11081f414e..5ddbd8c0b89 100644 --- a/rosapps/net/finger/various.h +++ b/rosapps/net/finger/various.h @@ -4,26 +4,12 @@ #ifndef VARIOUS_H #define VARIOUS_H -/* types.h */ -typedef unsigned char u_char; -typedef unsigned int u_int; + typedef float f4byte_t; typedef double f8byte_t; -//typedef __int16 s2byte_t; -//typedef __int32 s4byte_t; -//typedef __int64 s8byte_t; -//typedef unsigned __int16 u2byte_t; -//typedef unsigned __int32 u4byte_t; -//typedef unsigned __int64 u8byte_t; -//typedef __int32 quad_t; -//typedef unsigned __int32 u_quad_t; -//typedef unsigned __int16 u_int16_t; -//typedef unsigned __int32 u_int32_t; - typedef long uid_t; // SunOS 5.5 #define __P(x) x -#define __STDC__ 1 /* utmp.h */ #define UT_LINESIZE 8 @@ -45,11 +31,4 @@ typedef long uid_t; // SunOS 5.5 #define index(s, c) strchr(s, c) #define rindex(s, c) strrchr(s, c) -//#ifndef _WINSOCKAPI_ -//struct timeval { -// long tv_sec; /* seconds */ -// long tv_usec; /* and microseconds */ -//}; -//#endif - -#endif \ No newline at end of file +#endif -- 2.17.1