Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1

1 files changed, 8 insertions, 8 deletions

diff --git a/src/generate.hpp b/src/generate.hpp
index d09907b5..a21ba069 100644
--- a/src/generate.hpp
+++ b/src/generate.hpp
@@ -2,11 +2,11 @@
 
 #include "h-basic.h"
 
-extern bool_ new_player_spot(int branch);
-extern void add_level_generator(cptr name, bool_ (*generator)());
-extern bool_ level_generate_dungeon();
-extern bool_ generate_fracave(int y0, int x0,int xsize,int ysize,int cutoff,bool_ light,bool_ room);
-extern void generate_hmap(int y0, int x0,int xsiz,int ysiz,int grd,int roug,int cutoff);
-extern bool_ room_alloc(int x,int y,bool_ crowded,int by0,int bx0,int *xx,int *yy);
-extern void generate_cave(void);
-extern void build_rectangle(int y1, int x1, int y2, int x2, int feat, int info);
+bool_ new_player_spot(int branch);
+void add_level_generator(cptr name, bool_ (*generator)());
+bool_ level_generate_dungeon();
+bool_ generate_fracave(int y0, int x0,int xsize,int ysize,int cutoff,bool_ light,bool_ room);
+void generate_hmap(int y0, int x0,int xsiz,int ysiz,int grd,int roug,int cutoff);
+bool_ room_alloc(int x,int y,bool_ crowded,int by0,int bx0,int *xx,int *yy);
+void generate_cave();
+void build_rectangle(int y1, int x1, int y2, int x2, int feat, int info);