File dog-1.7-fixes.patch of Package dog
--- dog.c.orig 2000-06-21 18:04:43.000000000 +0200
+++ dog.c 2004-04-16 11:27:17.308361459 +0200
@@ -37,27 +37,12 @@
#include "getopt.h"
#include <limits.h>
#include <netdb.h>
+#include <time.h>
-// this is fun
-#if defined(__alpha)
-#define uint16 unsigned short
-#define int16 short
-#define uint32 unsigned int
-#define int32 int
-#define uint64 unsigned long
-#define int64 long
-#else
-#define uint16 unsigned short
-#define int16 short
-#define uint32 unsigned long
-#define int32 long
-#define uint64 unsigned long long
-#define int64 long long
-#endif
#if defined(__STDC__)
#define __dog_signed signed
#else
-#deifne __dog_signed
+#define __dog_signed
#endif
// config
@@ -100,7 +85,7 @@
typedef struct InternetSockAddressStruct {
unsigned short family; /* type of connection - unused! */
unsigned short port; /* connection port */
- uint32 addr; /* host IP number */
+ uint32_t addr; /* host IP number */
unsigned char padding[8]; /* padding */
} InetSockAddr;
@@ -292,11 +277,6 @@
memcpy(str,data,len);
}
-static void strins(char *str,const char *data)
-{
- strnins(str,data,strlen(data));
-}
-
static const char *OOG_NO_SAY[] = {
"IS","ARE","AM","A","AN","THAT","WHICH","THE","CAN","OUR","ANY","HIS","HERS"
};
@@ -1036,7 +1016,7 @@
static int CreateConnectedSocket(const char *domain_port)
{
char domain[128],*m;
- uint32 ipAddr;
+ uint32_t ipAddr;
int port;
int sock;
InetSockAddr sa;
@@ -1065,7 +1045,7 @@
if (!ent) {
return -1;
}
- ipAddr = ntohl(**((uint32**)ent->h_addr_list));
+ ipAddr = ntohl(**((uint32_t**)ent->h_addr_list));
}
// create socket
@@ -1320,7 +1300,7 @@
{
InetSockAddr sa;
int newsock;
- uint32 ipAddr;
+ uint32_t ipAddr;
int k;
time_t curr_time;
char curr_date[64];