Skip to content
Snippets Groups Projects
Commit bee370ab authored by rswindell's avatar rswindell
Browse files

Now #includes windows.h (to avoid DWORD, etc conflicts).

Always #includes sys/types.h (no reason not to).
parent b63da9ba
No related branches found
No related tags found
No related merge requests found
/* gen_defs.h */ /* gen_defs.h */
/* Synchronet general constant and macro definitions */ /* General(ly useful) constant, macro, and type definitions */
/* $Id$ */ /* $Id$ */
...@@ -38,6 +38,13 @@ ...@@ -38,6 +38,13 @@
#ifndef _GEN_DEFS_H #ifndef _GEN_DEFS_H
#define _GEN_DEFS_H #define _GEN_DEFS_H
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN /* Don't bring in excess baggage */
#include <windows.h>
#endif
#include <sys/types.h>
/* Control characters */ /* Control characters */
#define STX 0x02 /* Start of text ^B */ #define STX 0x02 /* Start of text ^B */
#define ETX 0x03 /* End of text ^C */ #define ETX 0x03 /* End of text ^C */
...@@ -96,9 +103,7 @@ enum { ...@@ -96,9 +103,7 @@ enum {
#ifndef uchar #ifndef uchar
#define uchar unsigned char #define uchar unsigned char
#endif #endif
#ifdef __GLIBC__ #ifndef __GLIBC__
#include <sys/types.h>
#else
#ifndef ushort #ifndef ushort
#define ushort unsigned short #define ushort unsigned short
#define uint unsigned int #define uint unsigned int
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment