? c.c Index: cdefs.h =================================================================== RCS file: /home/ncvs/src/sys/sys/cdefs.h,v retrieving revision 1.33 diff -u -r1.33 cdefs.h --- cdefs.h 2001/06/02 17:35:50 1.33 +++ cdefs.h 2001/09/05 01:30:00 @@ -192,22 +192,28 @@ #endif /* __ELF__ */ #endif /* __GNUC__ */ -#if defined(__GNUC__) && defined(__ELF__) +#ifdef __GNUC__ +#ifdef __ELF__ #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"") #else +#define __IDSTRING(name,string) __asm__(".data\n\t.asciz\t\"" string "\"\n\t.previous") +#else +/* You're out of luck, but this is about the best we can do without asm() */ #define __IDSTRING(name,string) static const char name[] __unused = string +/* Alternative: #define __IDSTRING(name,string) */ +#endif #endif #ifndef __RCSID -#define __RCSID(s) __IDSTRING(rcsid,s) +#define __RCSID(s) __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) #endif #ifndef __RCSID_SOURCE -#define __RCSID_SOURCE(s) __IDSTRING(rcsid_source,s) +#define __RCSID_SOURCE(s) __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) #endif #ifndef __COPYRIGHT -#define __COPYRIGHT(s) __IDSTRING(copyright,s) +#define __COPYRIGHT(s) __IDSTRING(__CONCAT(__copyright_,__LINE__),s) #endif #ifndef __DECONST