diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /src/angband.h | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'src/angband.h')
| -rw-r--r-- | src/angband.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/angband.h b/src/angband.h index cac38122..5fbc94e5 100644 --- a/src/angband.h +++ b/src/angband.h @@ -1,9 +1,4 @@ -/* File: angband.h */ - -/* Main "Angband" header file */ - -#ifndef INCLUDED_ANGBAND_H -#define INCLUDED_ANGBAND_H +#pragma once /* * Copyright (c) 1989 James E. Wilson @@ -13,7 +8,6 @@ * included in all such copies. */ - /* * C++ guard. */ @@ -32,9 +26,7 @@ extern "C" { * Then, include the header files for the low-level code */ #include "z-util.h" -#include "z-virt.h" #include "z-form.h" -#include "z-rand.h" #include "z-term.h" @@ -45,12 +37,9 @@ extern "C" { /* - * Now, include the define's, the type's, and the extern's + * Now, include the defines and the types */ #include "defines.h" -#include "types.h" -#include "externs.h" -#include "plots.h" /***** Some copyright messages follow below *****/ @@ -103,8 +92,3 @@ extern "C" { #ifdef __cplusplus } /* extern "C" */ #endif - -#endif - - - |