diff options
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/data.cxx | 6 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 19d0cc3dd391..240041f09d0f 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -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 f86835309323..5eb7eac74f26 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 |