diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-09-27 17:03:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-09-27 17:03:36 +0000 |
commit | 3f01d0898e531322d9d935ad3f16a9d7599ff386 (patch) | |
tree | 383d10976ebfed64d1ca7a7d25bffd6635876626 /tools/include | |
parent | a723361df9cb4cb58d7e806218d98df72d57cdae (diff) | |
download | upstream-3f01d0898e531322d9d935ad3f16a9d7599ff386.tar.gz upstream-3f01d0898e531322d9d935ad3f16a9d7599ff386.tar.bz2 upstream-3f01d0898e531322d9d935ad3f16a9d7599ff386.zip |
add portability fixes for toolchain/tools (full tools/toolchain build works on osx now)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4867 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/include')
-rw-r--r-- | tools/include/byteswap.h | 3 | ||||
-rw-r--r-- | tools/include/endian.h | 29 | ||||
-rw-r--r-- | tools/include/getline.h | 62 |
3 files changed, 94 insertions, 0 deletions
diff --git a/tools/include/byteswap.h b/tools/include/byteswap.h new file mode 100644 index 0000000000..61047167c3 --- /dev/null +++ b/tools/include/byteswap.h @@ -0,0 +1,3 @@ +#ifdef __linux__ +#include_next <byteswap.h> +#endif diff --git a/tools/include/endian.h b/tools/include/endian.h new file mode 100644 index 0000000000..4ea34cdd0f --- /dev/null +++ b/tools/include/endian.h @@ -0,0 +1,29 @@ +#ifndef __endian_compat_h +#define __endian_compat_h + +#if defined(__linux__) +#include_next <endian.h> +#elif defined(__APPLE__) +#include <machine/endian.h> +#include <machine/byte_order.h> +#define bswap_16(x) NXSwapShort(x) +#define bswap_32(x) NXSwapInt(x) +#define bswap_64(x) NXSwapLongLong(x) +#else +#include <machine/endian.h> +#define bswap_16(x) swap16(x) +#define bswap_32(x) swap32(x) +#define bswap_64(x) swap64(x) +#endif + +#ifndef __BYTE_ORDER +#define __BYTE_ORDER BYTE_ORDER +#endif +#ifndef __BIG_ENDIAN +#define __BIG_ENDIAN BIG_ENDIAN +#endif +#ifndef __LITTLE_ENDIAN +#define __LITTLE_ENDIAN LITTLE_ENDIAN +#endif + +#endif diff --git a/tools/include/getline.h b/tools/include/getline.h new file mode 100644 index 0000000000..219be75204 --- /dev/null +++ b/tools/include/getline.h @@ -0,0 +1,62 @@ +/*- + * Copyright (c) 2006 SPARTA, Inc. + * All rights reserved. + * + * This software was developed by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __linux__ +#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* + * Emulate glibc getline() via BSD fgetln(). + * Note that outsize is not changed unless memory is allocated. + */ +static inline ssize_t +getline(char **outbuf, size_t *outsize, FILE *fp) +{ + char *buf; + size_t len; + + buf = fgetln(fp, &len); + if (buf == NULL) + return (-1); + + /* Assumes realloc() accepts NULL for ptr (C99) */ + if (*outbuf == NULL || *outsize < len + 1) { + void *tmp = realloc(*outbuf, len + 1); + if (tmp == NULL) + return (-1); + *outbuf = tmp; + *outsize = len + 1; + } + memcpy(*outbuf, buf, len); + (*outbuf)[len] = '\0'; + return (len); +} +#endif |