diff --git a/source/duke3d/src/midi.cpp b/source/duke3d/src/midi.cpp index c8d4a2782..0e6398def 100644 --- a/source/duke3d/src/midi.cpp +++ b/source/duke3d/src/midi.cpp @@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **********************************************************************/ #include "compat.h" -#include "standard.h" +#include +#include #include "music.h" #include "_midi.h" #include "midi.h" diff --git a/source/duke3d/src/standard.h b/source/duke3d/src/standard.h deleted file mode 100644 index b3bc3191e..000000000 --- a/source/duke3d/src/standard.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright (C) 1994-1995 Apogee Software, Ltd. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au) -*/ -/********************************************************************** - module: STANDARD.H - - author: James R. Dose - date: May 25, 1994 - - Header containing standard definitions. - - (c) Copyright 1994 James R. Dose. All Rights Reserved. -**********************************************************************/ - -#ifndef __STANDARD_H -#define __STANDARD_H - -typedef int boolean; -typedef int errorcode; - -enum STANDARD_ERRORS - { - Warning = -2, - FatalError = -1, - Success = 0 - }; - -#ifdef NDEBUG - #define DEBUGGING 0 -#else - #define DEBUGGING 1 -#endif - -#define DEBUG_CODE \ - if ( DEBUGGING == 0 ) \ - { \ - } \ - else - -#endif