d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bootpd for Alpha.

Browse Source 
bptypes.h originally defined int32 to be of type long. This obviously
doesn't work on the Alpha. By defining int32 (and u_int32) in terms of
int32_t (and u_int32_t) it now is what it says it should be.

Two occurrences of 'unsigned int32' have been changed to 'u_int32' for
consistency.

Submitted by: Wilko Bulte <wilko@yedi.iaf.nl>
This commit is contained in:
Marcel Moolenaar 1999-11-12 10:11:48 +00:00
parent cb793943b5
commit 8ef94ce860
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/bootpd/bootp.h
View File

@ -44,7 +44,7 @@ struct bootp {
unsigned char bp_htype; /* hardware addr type */
unsigned char bp_hlen; /* hardware addr length */
unsigned char bp_hops; /* gateway hops */
unsigned int32 bp_xid; /* transaction ID */
u_int32 bp_xid; /* transaction ID */
unsigned short bp_secs; /* seconds since boot began */
unsigned short bp_flags; /* RFC1532 broadcast, etc. */
struct in_addr bp_ciaddr; /* client IP address */
@ -133,7 +133,7 @@ struct bootp {
struct cmu_vend {
char v_magic[4]; /* magic number */
unsigned int32 v_flags; /* flags/opcodes, etc. */
u_int32 v_flags; /* flags/opcodes, etc. */
struct in_addr v_smask; /* Subnet mask */
struct in_addr v_dgate; /* Default gateway */
struct in_addr v_dns1, v_dns2; /* Domain name servers */

4
libexec/bootpd/bootpd.h
View File

@ -23,6 +23,8 @@ SOFTWARE.
/*
* bootpd.h -- common header file for all the modules of the bootpd program.
*
* $FreeBSD$
*/
#include "bptypes.h"
@ -181,7 +183,7 @@ struct host {
RFC951 only allocates 1 byte. . . */
haddr[MAXHADDRLEN];
int32 time_offset;
unsigned int32 bootsize,
u_int32 bootsize,
msg_size,
min_wait;
struct in_addr bootserver,

12
libexec/bootpd/bptypes.h
View File

@ -1,16 +1,17 @@
/* bptypes.h */
/* $FreeBSD$
*/
#ifndef BPTYPES_H
#define BPTYPES_H
#include <sys/types.h>
/*
* 32 bit integers are different types on various architectures
*/
#ifndef int32
#define int32 long
#endif
typedef unsigned int32 u_int32;
#define int32 int32_t
#define u_int32 u_int32_t
/*
* Nice typedefs. . .
@ -19,5 +20,4 @@ typedef unsigned int32 u_int32;
typedef int boolean;
typedef unsigned char byte;
#endif /* BPTYPES_H */