diff options
| author | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
| commit | 5f003d228340c3ce8e500f9053f353c58dc1dc94 (patch) | |
| tree | a855b0f173ff635b48354e1136ef6cbb2a1214a4 /rts/Papi.h | |
| parent | ff9c5570395bcacf8963149b3a8475f5644ce694 (diff) | |
| parent | dff0623d5ab13222c06b3ff6b32793e05b417970 (diff) | |
| download | haskell-wip/generics-propeq.tar.gz | |
Merge branch 'master' into wip/generics-propeqwip/generics-propeq
Conflicts:
compiler/typecheck/TcGenGenerics.lhs
Diffstat (limited to 'rts/Papi.h')
| -rw-r--r-- | rts/Papi.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rts/Papi.h b/rts/Papi.h index 7e58c6fbbe..1aa1b31381 100644 --- a/rts/Papi.h +++ b/rts/Papi.h @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- * (c) The GHC Team 2006 - * + * * Initialization and use of the PAPI performance monitoring library * * ---------------------------------------------------------------------------*/ @@ -34,3 +34,11 @@ void papi_thread_stop_gc1_count(int event_set); #include "EndPrivate.h" #endif /* PAPI_H */ + +// Local Variables: +// mode: C +// fill-column: 80 +// indent-tabs-mode: nil +// c-basic-offset: 4 +// buffer-file-coding-system: utf-8-unix +// End: |