debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenBSD fixed for lib/DtSvc.

Browse Source
This commit is contained in:
Pascal Stumpf
2012-08-09 22:51:52 +02:00
committed by Jon Trulson
parent 78053ff2a4
commit 185ec24999
10 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/lib/DtSvc/include/bms/sbstdinc.h
View File

@@ -59,7 +59,7 @@
/************************************************************************/
/* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */
#if !defined(apollo) || !defined(__bsd)
#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
#if defined(__STDC__)
#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_)

4
cde/lib/DtSvc/include/codelibs/dynarray.h
View File

@@ -36,10 +36,10 @@
#ifndef __DYNARRAY_H_
#define __DYNARRAY_H_
#if !defined(linux)
#if !defined(linux) && !defined(CSRG_BASED)
#include <generic.h>
#endif
#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux)
#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
#define _DELETE_ARRAY(sz) delete[]
#else
#define _DELETE_ARRAY(sz) delete[(sz)]

2
cde/lib/DtSvc/include/codelibs/privbuf.h
View File

@@ -48,7 +48,7 @@ typedef void (*privbuf_func)(void *v);
#include <stddef.h>
#include <stdlib.h>
#if defined(__osf__) || defined(sun) || defined(linux)
#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
// The DEC C++ compiler rejects valid inline declarations, claiming
// they have both internal and external linkage.
#else

6
cde/lib/DtSvc/include/codelibs/stringx.h
View File

@@ -75,7 +75,7 @@ extern "C"
#ifdef __cplusplus
char *strtokx(char *&ptr, const char *sep);
# if !defined(__osf__) && !defined(linux)
# if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
char **strsep(const char *str, const char *sep,
boolean whsp = TRUE, int *num = NULL);
# if !defined(__osf__)
@@ -85,7 +85,7 @@ extern "C"
#else /* __STDC__ */
char *strtokx(char **ptr, const char *sep);
# if !defined(linux)
# if !defined(linux) && !defined(CSRG_BASED)
char **strsep(const char *str, const char *sep,
boolean whsp, int *num);
#endif
@@ -137,7 +137,7 @@ inline void strfree(const char *s)
{ if (s != NULL) free((char *)s); }
#else
inline void strfree(const char *s)
#if defined(__hpux) || defined(__osf__)
#if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED)
{ if (s != NULL) free((void *)s); }
#else
{ if (s != NULL) free((const void *)s); }