Bug#957817: smbc: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * static_str.{c,h}: Fix multiple definitions of variables causing FTBFS with
    GCC 10.

Thanks for considering the patch.

Logan

diff -Nru smbc-1.2.2/src/static_str.c smbc-1.2.2/src/static_str.c
--- smbc-1.2.2/src/static_str.c 2005-06-29 08:14:02.000000000 -0400
+++ smbc-1.2.2/src/static_str.c 2021-04-06 18:22:24.000000000 -0400
@@ -21,6 +21,32 @@
 #include "static_str.h"
 #include "fnet.h"
 
+char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
+
+     *Rm18, *Rm19,
+     *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,
+     *Rm30, *Rm31, *Rm32, *Rm33, *Rm34, *Rm35, *Rm36, *Rm37, *Rm38, *Rm39,
+     *Rm40, *Rm41, *Rm42, *Rm43, *Rm44, *Rm45, *Rm46,        *Rm48, *Rm49,
+     *Rm50, *Rm51, *Rm52, *Rm53, *Rm54, *Rm55,               *Rm58, *Rm59,
+     *Rm60, *Rm61, *Rm62, *Rm63, *Rm64, *Rm65,        *Rm67, *Rm68, *Rm69,
+     *Rm70, *Rm71, *Rm72, *Rm73, *Rm74, *Rm75, *Rm76, *Rm77, *Rm78, *Rm79,
+     *Rm80, *Rm81, *Rm82, *Rm83, *Rm84, *Rm85, *Rm86, *Rm87, *Rm88,
+     *Rm90, *Rm91, *Rm92, *Rm93, *Rm94, *Rm95, *Rm96, *Rm97, *Rm98, *Rm99,
+     *Rm100, *Rm101, *Rm102, *Rm103, *Rm104, *Rm105, *Rm106, *Rm107, *Rm108,
+             *Rm111,         *Rm113, *Rm114, *Rm115, *Rm116, *Rm117, *Rm118, 
*Rm119,
+             *Rm121,         *Rm123, *Rm124, *Rm125,                         
*Rm129,
+             *Rm131,         *Rm133, *Rm134, *Rm135, *Rm136, *Rm137, *Rm138, 
*Rm139,
+     *Rm140, *Rm141, *Rm142, *Rm143, *Rm144, *Rm145, *Rm146, *Rm147, *Rm148, 
*Rm149,
+     *Rm150, *Rm151, *Rm152, *Rm153, *Rm154,         *Rm156, *Rm157, *Rm158, 
*Rm159,
+     *Rm160,         *Rm162, *Rm163,                                 *Rm168, 
*Rm169,
+     *Rm170, *Rm171, *Rm172, *Rm173,         *Rm175, *Rm176, *Rm177, *Rm178, 
*Rm179,
+     *Rm180, *Rm181, *Rm182,
+
+     *Rm231, *Rm232, *Rm233, *Rm234, *Rm235, *Rm236, *Rm237, *Rm238, *Rm239,
+     *Rm240, *Rm241, *Rm242, *Rm243, *Rm244, *Rm245,
+
+     *Rm300, *Rm301, *Rm302, *Rm303, *Rm304, *Rm305, *Rm306, *Rm307;
+
 void 
 RinitStrings()
 {
diff -Nru smbc-1.2.2/src/static_str.h smbc-1.2.2/src/static_str.h
--- smbc-1.2.2/src/static_str.h 2005-06-29 08:14:02.000000000 -0400
+++ smbc-1.2.2/src/static_str.h 2021-04-06 18:22:24.000000000 -0400
@@ -9,7 +9,7 @@
 */
 // -------------------------------------------------------------------
 
-char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
+extern char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
 
      *Rm18, *Rm19,
      *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,