Fix merge conflicts

[bsdgames-darwin.git] / hack / extern.h

diff --git a/hack/extern.h b/hack/extern.h
index 152536b498bf22ed6e2222d61baa9f93fef5164d..1c005e25db086e04676ea71c3b290355d651ab58 100644 (file)
--- a/hack/extern.h
+++ b/hack/extern.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.17 2011/08/26 06:18:17 dholland Exp $     */
+/*     $NetBSD: extern.h,v 1.19 2021/05/02 12:50:44 rillig Exp $       */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -178,7 +178,7 @@ struct trap *t_at(int, int);
 struct gold *g_at(int, int);
 struct obj *getobj(const char *, const char *);
 int ggetobj(const char *, int (*fn)(struct obj *), int);
-int askchain(struct obj *, char *, int, int (*)(struct obj *), 
+int askchain(struct obj *, char *, int, int (*)(struct obj *),
     int (*)(struct obj *), int);
 void prinv(struct obj *);
 int ddoinv(void);
@@ -449,7 +449,7 @@ void drown(void);
 void gettty(void);
 void settty(const char *);
 void setftty(void);
-void error(const char *, ...) __printflike(1, 2);
+void error(const char *, ...) __printflike(1, 2) __dead;
 void getlin(char *);
 void getret(void);
 void cgetret(const char *);