philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move inclusion of system headers in misc.c to top, which fixes building on

Browse Source 
recent Cygwin (including windows.h after the macros defined in modval.h
causes the build to fail due to our 'load' macro).  Reported by VICODAN.

Also define WIN32_LEAN_AND_MEAN in misc.c, which should speed up Cygwin
build times a little.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@219 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-01-02 22:40:58 +00:00
parent 754f1a19eb
commit 2027f75969
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/misc.c
View File

@@ -4,6 +4,31 @@
#include "irc.h"
static char cvsrevision[] = "$Id$";
CVS_REVISION(misc_c)
#ifdef HAVE_LIBIPHLPAPI
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <iphlpapi.h>
#endif
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#ifndef __OPENNT
#include <sys/resource.h>
#endif
#include <unistd.h>
#if defined(sparc) && defined(sun4c)
#include <sys/rusage.h>
#endif
#include "struct.h"
#include "server.h"
@@ -45,24 +70,6 @@ CVS_REVISION(misc_c)
#define MAIN_SOURCE
#include "modval.h"
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#ifndef __OPENNT
#include <sys/resource.h>
#endif
#include <unistd.h>
#if defined(sparc) && defined(sun4c)
#include <sys/rusage.h>
#endif
#ifdef GUI
extern int guiipc[2];
extern int newscrollerpos, lastscrollerpos, lastscrollerwindow;
@@ -2054,8 +2061,6 @@ static struct resstats {
} ar_reinfo;
#ifdef HAVE_LIBIPHLPAPI
#include <windows.h>
#include <iphlpapi.h>
void ar_get_windows_dns(void)
{