- added missing return to translation code.

- a bit of header cleanup.

* moved <zlib.h> and <bzlib.h> from files.h to files_decompress.cpp because they are no longer needed for defining the interface.
* added <functional> to the precompiled header
This commit is contained in:
Christoph Oelckers 2018-03-12 21:18:11 +01:00
parent 5a4e9decd9
commit 5fccdd9acd
6 changed files with 5 additions and 3 deletions

View file

@ -37,9 +37,7 @@
#define FILES_H
#include <stdio.h>
#include <zlib.h>
#include <functional>
#include "bzlib.h"
#include "doomtype.h"
#include "m_swap.h"

View file

@ -35,6 +35,8 @@
// This also pulls in windows.h
#include "LzmaDec.h"
#include <zlib.h>
#include <bzlib.h>
#include "files.h"
#include "i_system.h"

View file

@ -23,6 +23,7 @@
#include <tuple>
#include <vector>
#include <utility>
#include <functional>
// These two headers get included nearly everywhere so it doesn't matter if changing them forces a few more recompiles.
// The overall savings from PCHing them are more significant.

View file

@ -743,6 +743,7 @@ bool FRemapTable::AddToTranslation(const char *range)
catch (CRecoverableError &err)
{
Printf("Error in translation '%s':\n%s\n", range, err.GetMessage());
return false;
}
}

View file

@ -29,6 +29,7 @@
*/
#include <string.h>
#include <stdint.h>
#include "timidity.h"
#include "tables.h"
#include "common.h"

View file

@ -28,7 +28,6 @@
#ifndef TIMIDITY_H_INCLUDED
#define TIMIDITY_H_INCLUDED 1
#include "c_cvars.h"
#include "controls.h"
#include "mblock.h"