diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:43:59 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:50:09 -0800 |
| commit | 76fce162659078323fcd5e54b3195dae371faca2 (patch) | |
| tree | c1d93d415b96238aae3c54eb83cb0815af2e4bca /src/angband.h | |
| parent | b4456969cd02d75c599a5b86b225c0774697e85d (diff) | |
| parent | 4aa1a39402c3908e9e8b6eb3fd4e2183d5e5c52e (diff) | |
Merge branch 'development' into upstream
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/.gitignore
# src/maid-x11.c
# src/quest.pkg
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 - - - |