[commit: ghc] master: Remove now pointless INLINE_ME macro (c7b32ad)

git at git.haskell.org git at git.haskell.org
Sun Mar 27 20:12:51 UTC 2016


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c7b32ad55f4a6ec59f431f47ac2a8a9099f87ab7/ghc

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

commit c7b32ad55f4a6ec59f431f47ac2a8a9099f87ab7
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Mar 27 21:43:44 2016 +0200

    Remove now pointless INLINE_ME macro
    
    At some point there may have been a reason for the
    `INLINE_ME` macro, but not anymore...
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D2041


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

c7b32ad55f4a6ec59f431f47ac2a8a9099f87ab7
 includes/Stg.h      | 1 -
 rts/win32/GetTime.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/Stg.h b/includes/Stg.h
index a2894a5..b179db6 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -137,7 +137,6 @@
 // The problem, however, is with 'extern inline' whose semantics significantly
 // differs between gnu90 and C99
 #define INLINE_HEADER static inline
-#define INLINE_ME inline
 #define STATIC_INLINE static inline
 
 // Figure out whether `__attributes__((gnu_inline))` is needed
diff --git a/rts/win32/GetTime.c b/rts/win32/GetTime.c
index 6a45248..30f1068 100644
--- a/rts/win32/GetTime.c
+++ b/rts/win32/GetTime.c
@@ -17,7 +17,7 @@
 
 /* Convert FILETIMEs into secs */
 
-static INLINE_ME Time
+static inline Time
 fileTimeToRtsTime(FILETIME ft)
 {
     Time t;



More information about the ghc-commits mailing list