Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-06 05:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed compiling with msvc

Browse source 
svn path=/trunk/; revision=18545
This commit is contained in:
Christoph von Wittich 2005-10-18 00:00:27 +00:00
parent 25886dff5a
commit 9d731530bd
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/subsys/system/dhcp/include/dhcpd.h
View file

@ -42,20 +42,31 @@
#ifndef DHCPD_H #ifndef DHCPD_H
#define DHCPD_H #define DHCPD_H
#if defined (_MSC_VER)
#pragma warning( once : 4103 )
#endif
#if !defined(ssize_t)
#define ssize_t long
#endif
#include <winsock2.h> #include <winsock2.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include "stdint.h" #include <stdint.h>
#define IFNAMSIZ MAX_INTERFACE_NAME_LEN #define IFNAMSIZ MAX_INTERFACE_NAME_LEN
#define ETH_ALEN 6 #define ETH_ALEN 6
#define ETHER_ADDR_LEN ETH_ALEN #define ETHER_ADDR_LEN ETH_ALEN
#include <pshpack1.h>
struct ether_header struct ether_header
{ {
u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */ u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */ u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */
u_int16_t ether_type; /* packet type ID field */ u_int16_t ether_type; /* packet type ID field */
} __attribute__ ((__packed__)); } ;
#include <poppack.h>
struct ip struct ip
{ {
@ -92,9 +103,17 @@ struct udphdr {
#define USE_SOCKET_RECEIVE #define USE_SOCKET_RECEIVE
#define USE_SOCKET_SEND #define USE_SOCKET_SEND
#if defined (_MSC_VER)
#include <types.h>
#include <stat.h>
#include <time.h>
#include <stddef.h>
#else
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -286,12 +305,14 @@ void do_packet(struct interface_info *, struct dhcp_packet *,
int, unsigned int, struct iaddr, struct hardware *); int, unsigned int, struct iaddr, struct hardware *);
/* errwarn.c */ /* errwarn.c */
#if defined (__GNUC__)
extern int warnings_occurred; extern int warnings_occurred;
void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
#endif
/* conflex.c */ /* conflex.c */
extern int lexline, lexchar; extern int lexline, lexchar;

7
reactos/subsys/system/dhcp/include/rosdhcp.h
View file

@ -32,7 +32,14 @@ typedef u_int32_t uintTIME;
#define TIME uintTIME #define TIME uintTIME
#include "dhcpd.h" #include "dhcpd.h"
#if (_MSC_VER < 900) || defined(__STDC__)
#define inline
#else
#define inline __inline
#endif
#define INLINE inline #define INLINE inline
#define PROTO(x) x #define PROTO(x) x
typedef void (*handler_t) PROTO ((struct packet *)); typedef void (*handler_t) PROTO ((struct packet *));

4
reactos/subsys/system/dhcp/util.c
View file

@ -10,6 +10,8 @@ char *piaddr( struct iaddr addr ) {
return inet_ntoa( sa.sin_addr ); return inet_ntoa( sa.sin_addr );
} }
#if defined (__GNUC__)
int note( char *format, ... ) { int note( char *format, ... ) {
va_list arg_begin; va_list arg_begin;
va_start( arg_begin, format ); va_start( arg_begin, format );
@ -72,6 +74,8 @@ void error( char *format, ... ) {
DPRINT1("ERROR: %s\n", buf); DPRINT1("ERROR: %s\n", buf);
} }
#endif
int16_t getShort( unsigned char *data ) { int16_t getShort( unsigned char *data ) {
return (int16_t) ntohs(*(int16_t*) data); return (int16_t) ntohs(*(int16_t*) data);
} }