File: 0007-Fix-duplicate-world_decl-definitions.patch

package info (click to toggle)
tf5 5.0beta8-10
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye, sid
  • size: 3,736 kB
  • sloc: ansic: 25,484; perl: 103; makefile: 82; sh: 79
file content (24 lines) | stat: -rw-r--r-- 681 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
From: Russ Allbery <rra@debian.org>
Date: Sun, 10 May 2020 15:27:41 -0700
Subject: Fix duplicate world_decl definitions

world_decl was an unused variable added solely to do a forward
declaration of struct World.  It can simply be omitted, which
fixes link errors with GCC 10.
---
 src/socket.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket.h b/src/socket.h
index 12cfd6f..36dd90a 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -21,7 +21,7 @@
 #define CONN_BG		0x08
 #define CONN_FG		0x10
 
-struct World   *world_decl;	/* declares struct World */
+struct World;	/* declares struct World */
 
 extern String *incoming_text;
 extern int quit_flag;