diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2003-12-13 21:35:43 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2003-12-13 21:35:43 +0000 |
| commit | 7059589bd64b2a99cab6df938b191d4e9fce56bd (patch) | |
| tree | 5f08e61f528456c64e85212ca62872ad7f7214a6 /www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h | |
| parent | Port to amd64 (note: requires ld-elf.so bugfix to actually work) (diff) | |
Port to amd64 (note: needs ld-elf.so.1 bugfix to actually work)
I've taken a chance and split the sparc64 and alpha mega-diffs up because
sparc64 patched the result of alpha's patches, and amd64 needed to do the
same again - but it was sorted lexically before alpha/sparc64. I've
grouped the xptcall patches together since they are standalone and split
up and merged the other infrastructure jumbo-patches.
I also attempted to sync up the nspr vs firebird diffs for sparc64 and
alpha because they disagreed. HOWEVER... While this port 'depends'
on the nspr port, it doesn't actually *use* it. It should probably
be removed from the LIB_DEPENDS list.
Note that the amd64 xptcall code came from SuSE via the mozilla bugzilla
database.
Notes
Notes:
svn path=/head/; revision=95748
Diffstat (limited to 'www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h')
| -rw-r--r-- | www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h b/www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h new file mode 100644 index 000000000000..edc10f32f824 --- /dev/null +++ b/www/firefox15/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h @@ -0,0 +1,30 @@ +--- directory/c-sdk/ldap/libraries/liblber/lber-int.h Tue Mar 26 13:53:23 2002 ++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h Sat Dec 13 13:02:49 2003 +@@ -236,15 +236,15 @@ + (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24)) + #define LBER_NTOHL(_l) LBER_HTONL(_l) + +-#elif !defined(__alpha) || defined(VMS) ++#elif !defined(__amd64__) && (!defined(__alpha) || defined(VMS)) + + #define LBER_HTONL( l ) htonl( l ) + #define LBER_NTOHL( l ) ntohl( l ) + + #else /* __alpha */ + /* +- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the +- * lower-order 32-bits of a (64-bit) long, so we define correct versions ++ * htonl and ntohl on the 64 bit UNIX platforms only swap the lower-order ++ * 32-bits of a (64-bit) long, so we define correct versions + * here. + */ + #define LBER_HTONL( l ) (((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \ +@@ -252,7 +252,7 @@ + + #define LBER_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \ + | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) +-#endif /* __alpha */ ++#endif /* __alpha || __amd64__ */ + + + /* function prototypes */ |