[med-svn] [Git][med-team/genometester][master] Follow hints in https://lists.debian.org/debian-med/2022/01/msg00030.html

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / genometester


Commits:
fefb8db3 by Andreas Tille at 2022-01-17T07:37:16+01:00
Follow hints in https://lists.debian.org/debian-med/2022/01/msg00030.html

- - - - -


1 changed file:

- debian/patches/avoid_redefinition.patch


Changes:

=====================================
debian/patches/avoid_redefinition.patch
=====================================
@@ -1,20 +1,31 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Sun, 16 Jan 2022 17:13:40 +0100
-Description: Attempt to avoid redefinition ... this is not working
+        Aaron M. Ucko <ucko at debian.org>
+Last-Update: Sun, 16 Jan 2022 21:32:08 -0500
+Origin: https://lists.debian.org/debian-med/2022/01/msg00030.html
+Description: Avoid "previous definition of ..."
 
---- a/src/word-map.c
-+++ b/src/word-map.c
-@@ -309,6 +309,7 @@ gt4_word_map_lookup (GT4WordMap *wmap, u
-   return 0;
- }
+--- a/src/word-map.h
++++ b/src/word-map.h
+@@ -86,19 +86,19 @@ struct _GT4WordMapClass {
+ 
+ unsigned int gt4_word_map_get_type (void);
  
-+/*
- uint64_t
+-inline extern uint64_t
++static inline uint64_t
  gt4_word_map_get_word (const GT4WordMap *wmap, uint64_t idx)
  {
-@@ -326,4 +327,4 @@ gt4_word_map_get_word_ptr (const GT4Word
+   return *((uint64_t *) (wmap->wordlist + 12 * idx));
+ }
+ 
+-inline extern uint32_t
++static inline uint32_t
+ gt4_word_map_get_count (const GT4WordMap *wmap, uint64_t idx)
+ {
+   return *((uint32_t *) (wmap->wordlist + 12 * idx + 8));
+ }
+ 
+-inline extern uint64_t *
++static inline uint64_t *
+ gt4_word_map_get_word_ptr (const GT4WordMap *wmap, uint64_t idx)
  {
    return (uint64_t *) (wmap->wordlist + 12 * idx);
- }
--
-+*/



View it on GitLab: https://salsa.debian.org/med-team/genometester/-/commit/fefb8db39b02d173b496bb830a1c0f6bc4fe0f1a

-- 
View it on GitLab: https://salsa.debian.org/med-team/genometester/-/commit/fefb8db39b02d173b496bb830a1c0f6bc4fe0f1a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220117/4bc6bf62/attachment-0001.htm>