From 99378e229f75ca9ef982d75a01f013d8ded17c44 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 24 Oct 2013 10:29:30 +0200 Subject: [PATCH] Remove gets() declaration (conflicts ) --- freebsd/sys/sys/libkern.h | 2 ++ rtemsbsd/include/machine/rtems-bsd-config.h.in | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/freebsd/sys/sys/libkern.h b/freebsd/sys/sys/libkern.h index 4675caa3..7638833d 100644 --- a/freebsd/sys/sys/libkern.h +++ b/freebsd/sys/sys/libkern.h @@ -94,7 +94,9 @@ int fls(int); int flsl(long); #endif int fnmatch(const char *, const char *, int); +#ifndef __rtems__ void gets(char *, size_t, int); +#endif /* __rtems__ */ int locc(int, char *, u_int); int memcmp(const void *b1, const void *b2, size_t len); void qsort(void *base, size_t nmemb, size_t size, diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-config.h.in index 4fc27e79..2aedfba3 100644 --- a/rtemsbsd/include/machine/rtems-bsd-config.h.in +++ b/rtemsbsd/include/machine/rtems-bsd-config.h.in @@ -96,7 +96,6 @@ #include -#define gets _bsd_gets #define realloc _bsd_realloc #define reallocf _bsd_reallocf #define setenv _bsd_setenv