IF_DEBUG(linker, debugBelch("Checking whether to unload " FMT_PATH "\n",
doesn't that expand to
IF_DEBUG(linker, debugBelch("Checking whether to unload " "%S" "\n",
What does the C compiler make of three strings in a row? Does it automatically concatenate them? Is that ANSI C?
S
| -----Original Message-----
| From: ghc-devs [mailto:ghc-devs-bounces@haskell.org] On Behalf Of Edward
| Z. Yang
| Sent: 04 September 2013 10:15
| To: Jost Berthold
| Cc: ghc-devs
| Subject: Re: RE: More windows woe
|
| I think this is reasonable, with the added caveat that
| the macros should be placed in includes/rts/Linker.h, because that is
| where pathchar is defined. So how about something like:
|
| diff --git a/includes/rts/Linker.h b/includes/rts/Linker.h
| index e900e85..871b8cd 100644
| --- a/includes/rts/Linker.h
| +++ b/includes/rts/Linker.h
| @@ -16,8 +16,10 @@
|
| #if defined(mingw32_HOST_OS)
| typedef wchar_t pathchar;
| +#define FMT_PATH "%S"
| #else
| typedef char pathchar;
| +#define FMT_PATH "%s"
| #endif
|
| /* initialize the object linker */
| diff --git a/rts/CheckUnload.c b/rts/CheckUnload.c
| index a758b06..8dc8fdc 100644
| --- a/rts/CheckUnload.c
| +++ b/rts/CheckUnload.c
| @@ -254,7 +254,7 @@ void checkUnload (StgClosure *static_objects)
|
| // Mark every unloadable object as unreferenced initially
| for (oc = unloaded_objects; oc; oc = oc->next) {
| - IF_DEBUG(linker, debugBelch("Checking whether to unload %s\n",
| + IF_DEBUG(linker, debugBelch("Checking whether to unload "
| FMT_PATH "\n",
| oc->fileName));
| oc->referenced = rtsFalse;
| }
| @@ -290,11 +290,11 @@ void checkUnload (StgClosure *static_objects)
| } else {
| prev->next = oc->next;
| }
| - IF_DEBUG(linker, debugBelch("Unloading object file %s\n",
| + IF_DEBUG(linker, debugBelch("Unloading object file " FMT_PATH
| "\n",
| oc->fileName));
| freeObjectCode(oc);
| } else {
| - IF_DEBUG(linker, debugBelch("Object file still in use: %s\n",
| + IF_DEBUG(linker, debugBelch("Object file still in use: "
| FMT_PATH "\n",
| oc->fileName));
| }
| }
| diff --git a/rts/Linker.c b/rts/Linker.c
| index 6490242..4f0a1c4 100644
| --- a/rts/Linker.c
| +++ b/rts/Linker.c
| @@ -2790,7 +2790,7 @@ unloadObj( pathchar *path )
|
| initLinker();
|
| - IF_DEBUG(linker, debugBelch("unloadObj: %s\n", path));
| + IF_DEBUG(linker, debugBelch("unloadObj: " FMT_PATH "\n", path));
|
| prev = NULL;
| for (oc = objects; oc; prev = oc, oc = next) {
|
| Excerpts from Jost Berthold's message of Tue Sep 03 12:56:03 -0700 2013:
| > > From: Simon Peyton-Jones