[commit: nofib] master: fasta: Inline function needs to be static (0574f35)

git at git.haskell.org git at git.haskell.org
Sun Oct 22 03:25:07 UTC 2017


Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0574f35e65a01b08e3fb8f89aeaa297f3a00900a/nofib

>---------------------------------------------------------------

commit 0574f35e65a01b08e3fb8f89aeaa297f3a00900a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Oct 21 23:20:56 2017 -0400

    fasta: Inline function needs to be static
    
    if I read http://gcc.gnu.org/onlinedocs/gcc/Inline.html correctly.
    
    Also, clean generated files.


>---------------------------------------------------------------

0574f35e65a01b08e3fb8f89aeaa297f3a00900a
 shootout/fasta/Makefile  | 2 ++
 shootout/fasta/fasta-c.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/shootout/fasta/Makefile b/shootout/fasta/Makefile
index f6beb8e..97a8b17 100644
--- a/shootout/fasta/Makefile
+++ b/shootout/fasta/Makefile
@@ -5,6 +5,8 @@ include $(TOP)/mk/boilerplate.mk
 # we don't want to include fasta-c.c
 SRCS = Main.hs
 
+CLEAN_FILES += fasta-c fasta.faststdout fasta.stdout fasta.slowstdout
+
 FAST_OPTS = 250000
 NORM_OPTS = 2500000
 SLOW_OPTS = 25000000  # official shootout setting
diff --git a/shootout/fasta/fasta-c.c b/shootout/fasta/fasta-c.c
index 5779316..7219b49 100644
--- a/shootout/fasta/fasta-c.c
+++ b/shootout/fasta/fasta-c.c
@@ -37,7 +37,7 @@ amino homosapiens[] = {
 #define WIDTH 60
 #define LENGTH(a) (sizeof(a)/sizeof(a[0]))
 
-inline void str_write(char *s) {
+static inline void str_write(char *s) {
    write(fileno(stdout), s, strlen(s));
 }
 



More information about the ghc-commits mailing list