diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-24 13:49:58 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-24 13:49:58 +0000 |
| commit | b317a4cd28f575b60cdff0da86afef5c1bde9a06 (patch) | |
| tree | e69c586e43d18c97048102b6e9fb963da005c690 /dln.c | |
| parent | 5153fd2a5e930b70ebae087e2f6e254cf4a30929 (diff) | |
| download | ruby-b317a4cd28f575b60cdff0da86afef5c1bde9a06.tar.gz | |
* io.c: use "__sun" instead of "sun" to detect SunOS.
* dln.c: ditto.
* cont.c: ditto.
* ext/sdbm/_sdbm.c: ditto.
[ruby-dev:44693]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dln.c')
| -rw-r--r-- | dln.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -228,7 +228,7 @@ load_header(int fd, struct exec *hdrp, long disp) #define RELOC_TARGET_SIZE(r) ((r)->r_length) #endif -#if defined(sun) && defined(sparc) +#if defined(__sun) && defined(sparc) /* Sparc (Sun 4) macros */ # undef relocation_info # define relocation_info reloc_info_sparc @@ -530,7 +530,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg) { int datum; char *address; -#if defined(sun) && defined(sparc) +#if defined(__sun) && defined(sparc) unsigned int mask = 0; #endif @@ -539,7 +539,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg) datum = arg->value; if (R_PCREL(&(undef->reloc))) datum -= undef->base; -#if defined(sun) && defined(sparc) +#if defined(__sun) && defined(sparc) datum += undef->reloc.r_addend; datum >>= R_RIGHTSHIFT(&(undef->reloc)); mask = (1 << R_BITSIZE(&(undef->reloc))) - 1; @@ -763,7 +763,7 @@ load_1(int fd, long disp, const char *need_init) while (rel < rel_end) { char *address = (char*)(rel->r_address + block); long datum = 0; -#if defined(sun) && defined(sparc) +#if defined(__sun) && defined(sparc) unsigned int mask = 0; #endif @@ -798,7 +798,7 @@ load_1(int fd, long disp, const char *need_init) } /* end .. is static */ if (R_PCREL(rel)) datum -= block; -#if defined(sun) && defined(sparc) +#if defined(__sun) && defined(sparc) datum += rel->r_addend; datum >>= R_RIGHTSHIFT(rel); mask = (1 << R_BITSIZE(rel)) - 1; |