[Guile-commits] GNU Guile branch, master, updated. release_1-9-1-54-g6e5c02b

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=6e5c02b8a3d8783e6093e8147bec169e844c4d99

The branch, master has been updated
       via  6e5c02b8a3d8783e6093e8147bec169e844c4d99 (commit)
      from  86cfb42d56907c77e557b760328bfcee0d3be20c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6e5c02b8a3d8783e6093e8147bec169e844c4d99
Author: Andy Wingo <address@hidden>
Date:   Tue Aug 11 21:16:05 2009 +0200

    make the fallback path look less like line noise
    
    * libguile/_scm.h:
    * libguile/load.c: Rework to only include the relevant pieces in the
      fallback path.

-----------------------------------------------------------------------

Summary of changes:
 libguile/_scm.h |   16 ++++++++++++++--
 libguile/load.c |    3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 693ec1d..ff16a85 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -170,9 +170,21 @@
 /* The word size marker in objcode.  */
 #define SCM_OBJCODE_WORD_SIZE  SCM_CPP_STRINGIFY (SIZEOF_VOID_P)
 
+// major and minor versions must be single characters
+#define SCM_OBJCODE_MAJOR_VERSION 0
+#define SCM_OBJCODE_MINOR_VERSION A
+#define SCM_OBJCODE_MAJOR_VERSION_STRING        \
+  SCM_CPP_STRINGIFY(SCM_OBJCODE_MAJOR_VERSION)
+#define SCM_OBJCODE_MINOR_VERSION_STRING        \
+  SCM_CPP_STRINGIFY(SCM_OBJCODE_MINOR_VERSION)
+#define SCM_OBJCODE_VERSION_STRING                                      \
+  SCM_OBJCODE_MAJOR_VERSION_STRING "." SCM_OBJCODE_MINOR_VERSION_STRING
+#define SCM_OBJCODE_MACHINE_VERSION_STRING                              \
+  SCM_OBJCODE_VERSION_STRING "-" SCM_OBJCODE_ENDIANNESS "-" 
SCM_OBJCODE_WORD_SIZE
+
 /* The objcode magic header.  */
-#define SCM_OBJCODE_COOKIE                                             \
-  "GOOF-0.9-" SCM_OBJCODE_ENDIANNESS "-" SCM_OBJCODE_WORD_SIZE "---"
+#define SCM_OBJCODE_COOKIE                              \
+  "GOOF-" SCM_OBJCODE_MACHINE_VERSION_STRING "---"
 
 
 #endif  /* SCM__SCM_H */
diff --git a/libguile/load.c b/libguile/load.c
index b27bb82..08324c5 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -253,7 +253,8 @@ scm_init_load_path ()
     struct passwd *pwd;
 #endif
 
-#define FALLBACK_DIR "guile/ccache/"SCM_EFFECTIVE_VERSION"/"SCM_OBJCODE_COOKIE
+#define FALLBACK_DIR \
+    "guile/ccache/" SCM_EFFECTIVE_VERSION "-" 
SCM_OBJCODE_MACHINE_VERSION_STRING
 
     if ((e = getenv ("XDG_CACHE_HOME")))
       snprintf (cachedir, sizeof(cachedir), "%s" FALLBACK_DIR, e);


hooks/post-receive
-- 
GNU Guile