From 364647ba8baa72a6f39ab057c8a2b024d910ac5e Mon Sep 17 00:00:00 2001 From: Brian Mastenbrook Date: Wed, 29 Oct 2008 16:09:27 +0000 Subject: [PATCH] 1.0.21.37: Use /**/ instead of ## to concatenate symbols on PPC/Darwin --- src/runtime/globals.h | 2 +- src/runtime/ppc-assem.S | 2 +- version.lisp-expr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime/globals.h b/src/runtime/globals.h index e5a3a23..679e626 100644 --- a/src/runtime/globals.h +++ b/src/runtime/globals.h @@ -99,7 +99,7 @@ extern void globals_init(void); /**/ # ifdef LISP_FEATURE_PPC # ifdef LISP_FEATURE_DARWIN -# define EXTERN(name,bytes) .globl _/**/name +# define EXTERN(name,bytes) .globl _ ## name # else # define EXTERN(name,bytes) .globl name # endif diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S index 974f339..c95fa0e 100644 --- a/src/runtime/ppc-assem.S +++ b/src/runtime/ppc-assem.S @@ -21,7 +21,7 @@ .align 3 @ \ _##x: -#define GFUNCDEF(x) .globl _/**/x @ \ +#define GFUNCDEF(x) .globl _ ## x @ \ FUNCDEF(x) #else #define FUNCDEF(x) .text ; \ diff --git a/version.lisp-expr b/version.lisp-expr index fe89250..4dccc12 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.21.36" +"1.0.21.37" -- 1.7.10.4