a658537fcb
error: /usr/bin/ld: xactions.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/x3270/../../../x3270/xscreen.h:166: multiple definition of `font_list'; about.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/x3270/../../../x3270/xscreen.h:166: first defined here /usr/bin/ld: xkybd.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/x3270/../../../x3270/xscreen.h:167: multiple definition of `font_count'; about.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/x3270/../../../x3270/xscreen.h:167: first defined here /usr/bin/ld: help.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/c3270/../../../include/glue.h:53: multiple definition of `Warning_redirect'; c3270.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/c3270/../../../include/glue.h:53: first defined here /usr/bin/ld: help.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/c3270/../../../include/glue.h:52: multiple definition of `Error_redirect'; c3270.o:/home/abuild/rpmbuild/BUILD/suite3270-3.6/obj/aarch64-openEuler-linux-gnu/c3270/../../../include/glue.h:52: first defined here
21 lines
674 B
Diff
21 lines
674 B
Diff
--- a/x3270/xscreen.h_old 2021-08-03 15:23:42.725100426 +0800
|
|
+++ b/x3270/xscreen.h 2021-08-03 15:23:54.081295953 +0800
|
|
@@ -163,5 +163,5 @@
|
|
struct font_list *next;
|
|
char *mlabel;
|
|
};
|
|
-struct font_list *font_list;
|
|
-int font_count;
|
|
+extern struct font_list *font_list;
|
|
+extern int font_count;
|
|
--- a/include/glue.h 2021-08-03 15:43:01.289032463 +0800
|
|
+++ b/include/glue.h 2021-08-03 15:41:24.155363894 +0800
|
|
@@ -49,5 +49,5 @@
|
|
void register_merge_profile(merge_profile_t *);
|
|
|
|
/* XtGlue.c */
|
|
-void (*Error_redirect)(const char *);
|
|
-void (*Warning_redirect)(const char *);
|
|
+extern void (*Error_redirect)(const char *);
|
|
+extern void (*Warning_redirect)(const char *);
|