diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2010-12-16 22:39:28 +0100 |
|---|---|---|
| committer | Thomas Klausner <wiz@NetBSD.org> | 2010-12-16 22:39:28 +0100 |
| commit | 76f18ae1c20ac0caf7f55e1d95203f11fe955d97 (patch) | |
| tree | 6324b69d163893cce4c5601a19071746bcfde53f /cppu | |
| parent | f23dee29479aedda75aa8f4d70e1136eb0aee07e (diff) | |
Handle NetBSD like the other BSDs in more cases.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/data.cxx | 8 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 6843617e5..783012452 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -360,8 +360,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #endif #if defined(INTEL) \ - && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) || \ - defined(OPENBSD)) || defined(MACOSX) \ + && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) \ + || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) \ || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif @@ -374,7 +374,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } #if OSL_DEBUG_LEVEL > 1 -#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OPENBSD)) && \ +#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) && \ (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390)) #define BINTEST_VERIFYSIZE( s, n ) \ fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index f86835309..5eb7eac74 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF |