提交: 7f68529939f6551bcf9c2b0dfc7a90f612e4d71e - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: 7f68529939f6551bcf9c2b0dfc7a90f612e4d71e (tree)
• 时间: 2004-07-15 04:40:21
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Multiply defined symbols, and stray backslash

更改概述

• modified: ChangeLog
• modified: app/interface.h
• modified: doc/pl/Makefile.am

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* doc/pl/Makefile.am: Avoid error based on backslash in comment.
+	
+	* app/interface.h: Avoid multiply defined symbols (#147396)
+
 2004-07-13  Lars Clausen  <[e-mail]>
 
 	* app/paginate_psprint.c (diagram_print_ps): Give usable type for

--- a/app/interface.h
+++ b/app/interface.h
@@ -50,9 +50,9 @@ void tool_select_callback(GtkWidget *widget, gpointer data);
 
 void create_tree_window(void);
 
-GtkWidget *popup_shell;
+extern GtkWidget *popup_shell;
 void create_sheets(GtkWidget *parent);
-GtkWidget *modify_tool_button;
+extern GtkWidget *modify_tool_button;
 
 typedef struct _ToolButton ToolButton;
 

--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -24,4 +24,4 @@ EXTRA_DIST += \
 	graphics/home_network.png \
 	graphics/greendots.png
 
-#	usage-objects-basic.xml \
+#	usage-objects-basic.xml