From 95c26f9a6b45fc3f24c32080f04e7e5ce54781f2 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sat, 23 Jun 2012 00:02:49 +0000 Subject: [PATCH] Remove outdated autoconf tests in bnlib --- .../third_party/bnlib/bignum-ARM/bntest16.c | 6 -- .../third_party/bnlib/bignum-ARM/config.h | 15 ----- .../third_party/bnlib/bignum-ARM/kludge.h | 55 ------------------- .../third_party/bnlib/bignum-ARM/lbn16.c | 6 -- .../third_party/bnlib/bignum-ARM/lbnmem.c | 6 -- libs/libzrtp/third_party/bnlib/bn16.c | 6 -- libs/libzrtp/third_party/bnlib/bn32.c | 6 -- libs/libzrtp/third_party/bnlib/bn64.c | 6 -- libs/libzrtp/third_party/bnlib/bnconfig.hin | 15 ----- libs/libzrtp/third_party/bnlib/bnconfig.win | 15 ----- libs/libzrtp/third_party/bnlib/bntest16.c | 6 -- libs/libzrtp/third_party/bnlib/bntest32.c | 6 -- libs/libzrtp/third_party/bnlib/bntest64.c | 6 -- libs/libzrtp/third_party/bnlib/configure.in | 55 ------------------- libs/libzrtp/third_party/bnlib/germtest.c | 3 - libs/libzrtp/third_party/bnlib/kludge.h | 55 ------------------- libs/libzrtp/third_party/bnlib/lbn16.c | 6 -- libs/libzrtp/third_party/bnlib/lbn32.c | 6 -- libs/libzrtp/third_party/bnlib/lbn64.c | 6 -- libs/libzrtp/third_party/bnlib/lbnmem.c | 6 -- libs/libzrtp/third_party/bnlib/sieve.c | 6 -- libs/libzrtp/third_party/bnlib/test/kludge.h | 34 ------------ 22 files changed, 331 deletions(-) diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c b/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c index ccb5f2504e..c220d6e683 100644 --- a/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c +++ b/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c @@ -31,9 +31,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #include @@ -48,9 +45,6 @@ long strtol(const char *, char **, int); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "cputime.h" #include "lbn16.h" diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/config.h b/libs/libzrtp/third_party/bnlib/bignum-ARM/config.h index 671be5c7fc..27e128c8d9 100644 --- a/libs/libzrtp/third_party/bnlib/bignum-ARM/config.h +++ b/libs/libzrtp/third_party/bnlib/bignum-ARM/config.h @@ -27,7 +27,6 @@ #define NO_STRING_H !HAVE_STRING_H #define HAVE_STRINGS_H 0 -#define NEED_MEMORY_H 0 /* We go to some trouble to find accurate times... */ @@ -51,20 +50,6 @@ /* Defines for various kinds of library brokenness */ -/* Define if is missing prototypes (= lots of warnings!) */ -#define NO_STDIO_PROTOS 0 - -/* Define if depends on and breaks without it */ -#define ASSERT_NEEDS_STDIO 0 -/* Define if depends on and complains without it */ -#define ASSERT_NEEDS_STDLIB 0 - -/* - * Define if delcares the mem* functions to take char * - * instead of void * parameters (= lots of warnings) - */ -#define MEM_PROTOS_BROKEN 0 - /* If not available, bcopy() is substituted */ #define HAVE_MEMMOVE 1 #define NO_MEMMOVE !HAVE_MEMMOVE diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/kludge.h b/libs/libzrtp/third_party/bnlib/bignum-ARM/kludge.h index 023c8905d7..6c5340e789 100644 --- a/libs/libzrtp/third_party/bnlib/bignum-ARM/kludge.h +++ b/libs/libzrtp/third_party/bnlib/bignum-ARM/kludge.h @@ -11,28 +11,10 @@ * Some compilers complain about #if FOO if FOO isn't defined, * so do the ANSI-mandated thing explicitly... */ -#ifndef ASSERT_NEEDS_STDIO -#define ASSERT_NEEDS_STDIO 0 -#endif -#ifndef ASSERT_NEEDS_STDLIB -#define ASSERT_NEEDS_STDLIB 0 -#endif #ifndef NO_STDLIB_H #define NO_STDLIB_H 0 #endif -/* SunOS 4.1.x needs "stderr" defined, and "exit" declared... */ -#ifdef assert -#if ASSERT_NEEDS_STDIO -#include -#endif -#if ASSERT_NEEDS_STDLIB -#if !NO_STDLIB_H -#include -#endif -#endif -#endif - #ifndef NO_MEMMOVE #define NO_MEMMOVE 0 #endif @@ -47,43 +29,6 @@ #define memcpy(dest,src,len) bcopy(src,dest,len) #endif -#ifndef MEM_PROTOS_BROKEN -#define MEM_PROTOS_BROKEN 0 -#endif -#if MEM_PROTOS_BROKEN -#define memcpy(d,s,l) memcpy((void *)(d), (void const *)(s), l) -#define memmove(d,s,l) memmove((void *)(d), (void const *)(s), l) -#define memcmp(d,s,l) memcmp((void const *)(d), (void const *)(s), l) -#define memset(d,v,l) memset((void *)(d), v, l) -#endif - -/* - * If there are no prototypes for the stdio functions, use these to - * reduce compiler warnings. Uses EOF as a giveaway to indicate - * that was #included. - */ -#ifndef NO_STDIO_PROTOS -#define NO_STDIO_PROTOS 0 -#endif -#if NO_STDIO_PROTOS /* Missing prototypes for "simple" functions */ -#ifdef EOF -#ifdef __cplusplus -extern "C" { -#endif -int (puts)(char const *); -int (fputs)(char const *, FILE *); -int (fflush)(FILE *); -int (printf)(char const *, ...); -int (fprintf)(FILE *, char const *, ...); -/* If we have a sufficiently old-fashioned stdio, it probably uses these... */ -int (_flsbuf)(int, FILE *); -int (_filbuf)(FILE *); -#ifdef __cplusplus -} -#endif -#endif /* EOF */ -#endif /* NO_STDIO_PROTOS */ - /* * Borland C seems to think that it's a bad idea to decleare a * structure tag and not declare the contents. I happen to think diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/lbn16.c b/libs/libzrtp/third_party/bnlib/bignum-ARM/lbn16.c index c28e9f2fc0..0b8d52e021 100644 --- a/libs/libzrtp/third_party/bnlib/bignum-ARM/lbn16.c +++ b/libs/libzrtp/third_party/bnlib/bignum-ARM/lbn16.c @@ -84,9 +84,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -99,9 +96,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn.h" #include "lbn16.h" diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/lbnmem.c b/libs/libzrtp/third_party/bnlib/bignum-ARM/lbnmem.c index a25844c4c7..70094d5f31 100644 --- a/libs/libzrtp/third_party/bnlib/bignum-ARM/lbnmem.c +++ b/libs/libzrtp/third_party/bnlib/bignum-ARM/lbnmem.c @@ -31,9 +31,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_STDLIB_H #include /* For malloc() & co. */ @@ -48,9 +45,6 @@ void free(); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #ifndef DBMALLOC #define DBMALLOC 0 diff --git a/libs/libzrtp/third_party/bnlib/bn16.c b/libs/libzrtp/third_party/bnlib/bn16.c index c783827b08..d81ac6acaa 100644 --- a/libs/libzrtp/third_party/bnlib/bn16.c +++ b/libs/libzrtp/third_party/bnlib/bn16.c @@ -29,9 +29,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -44,9 +41,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif /* * This was useful during debugging, so it's left in here. diff --git a/libs/libzrtp/third_party/bnlib/bn32.c b/libs/libzrtp/third_party/bnlib/bn32.c index d7fd51ea2e..d9daca0c97 100644 --- a/libs/libzrtp/third_party/bnlib/bn32.c +++ b/libs/libzrtp/third_party/bnlib/bn32.c @@ -29,9 +29,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -44,9 +41,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif /* * This was useful during debugging, so it's left in here. diff --git a/libs/libzrtp/third_party/bnlib/bn64.c b/libs/libzrtp/third_party/bnlib/bn64.c index 2c98b4b07d..841a277a48 100644 --- a/libs/libzrtp/third_party/bnlib/bn64.c +++ b/libs/libzrtp/third_party/bnlib/bn64.c @@ -29,9 +29,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -44,9 +41,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif /* * This was useful during debugging, so it's left in here. diff --git a/libs/libzrtp/third_party/bnlib/bnconfig.hin b/libs/libzrtp/third_party/bnlib/bnconfig.hin index c526b8e359..1b5e5986f9 100644 --- a/libs/libzrtp/third_party/bnlib/bnconfig.hin +++ b/libs/libzrtp/third_party/bnlib/bnconfig.hin @@ -29,7 +29,6 @@ #define NO_STRING_H !HAVE_STRING_H #define HAVE_STRINGS_H 0 -#define NEED_MEMORY_H 0 /* We go to some trouble to find accurate times... */ @@ -53,20 +52,6 @@ /* Defines for various kinds of library brokenness */ -/* Define if is missing prototypes (= lots of warnings!) */ -#define NO_STDIO_PROTOS 0 - -/* Define if depends on and breaks without it */ -#define ASSERT_NEEDS_STDIO 0 -/* Define if depends on and complains without it */ -#define ASSERT_NEEDS_STDLIB 0 - -/* - * Define if delcares the mem* functions to take char * - * instead of void * parameters (= lots of warnings) - */ -#define MEM_PROTOS_BROKEN 0 - /* If not available, bcopy() is substituted */ #define HAVE_MEMMOVE 0 #define NO_MEMMOVE !HAVE_MEMMOVE diff --git a/libs/libzrtp/third_party/bnlib/bnconfig.win b/libs/libzrtp/third_party/bnlib/bnconfig.win index 303a25b689..2e36938835 100644 --- a/libs/libzrtp/third_party/bnlib/bnconfig.win +++ b/libs/libzrtp/third_party/bnlib/bnconfig.win @@ -29,7 +29,6 @@ #define NO_STRING_H !HAVE_STRING_H #define HAVE_STRINGS_H 0 -#define NEED_MEMORY_H 0 /* We go to some trouble to find accurate times... */ @@ -53,20 +52,6 @@ /* Defines for various kinds of library brokenness */ -/* Define if is missing prototypes (= lots of warnings!) */ -#define NO_STDIO_PROTOS 0 - -/* Define if depends on and breaks without it */ -#define ASSERT_NEEDS_STDIO 0 -/* Define if depends on and complains without it */ -#define ASSERT_NEEDS_STDLIB 0 - -/* - * Define if delcares the mem* functions to take char * - * instead of void * parameters (= lots of warnings) - */ -#define MEM_PROTOS_BROKEN 0 - /* If not available, bcopy() is substituted */ #define HAVE_MEMMOVE 1 #define NO_MEMMOVE !HAVE_MEMMOVE diff --git a/libs/libzrtp/third_party/bnlib/bntest16.c b/libs/libzrtp/third_party/bnlib/bntest16.c index 9068f0fbb9..19ccbd0ac9 100644 --- a/libs/libzrtp/third_party/bnlib/bntest16.c +++ b/libs/libzrtp/third_party/bnlib/bntest16.c @@ -38,9 +38,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #include @@ -55,9 +52,6 @@ long strtol(const char *, char **, int); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn16.h" #include "kludge.h" diff --git a/libs/libzrtp/third_party/bnlib/bntest32.c b/libs/libzrtp/third_party/bnlib/bntest32.c index 987dc77f34..6cc9ff27c5 100644 --- a/libs/libzrtp/third_party/bnlib/bntest32.c +++ b/libs/libzrtp/third_party/bnlib/bntest32.c @@ -38,9 +38,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #include @@ -55,9 +52,6 @@ long strtol(const char *, char **, int); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn32.h" #include "kludge.h" diff --git a/libs/libzrtp/third_party/bnlib/bntest64.c b/libs/libzrtp/third_party/bnlib/bntest64.c index 01fda81891..dbc4fd6c0d 100644 --- a/libs/libzrtp/third_party/bnlib/bntest64.c +++ b/libs/libzrtp/third_party/bnlib/bntest64.c @@ -38,9 +38,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #include @@ -55,9 +52,6 @@ long strtol(const char *, char **, int); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn64.h" #include "kludge.h" diff --git a/libs/libzrtp/third_party/bnlib/configure.in b/libs/libzrtp/third_party/bnlib/configure.in index 917762ec4e..0520be70a4 100644 --- a/libs/libzrtp/third_party/bnlib/configure.in +++ b/libs/libzrtp/third_party/bnlib/configure.in @@ -219,64 +219,9 @@ else # If non-ANSI, check for other brokenness. AC_CHECK_HEADERS(assert.h limits.h stdlib.h string.h) -# Do we want to include memory.h? -if test $ac_cv_header_string_h = no; then -AC_CHECK_HEADERS(strings.h) -ac_found=no -else -AC_MSG_CHECKING(whether string.h declares mem functions) -AC_EGREP_HEADER(memset, string.h, ac_found=yes, ac_found=no) -AC_MSG_RESULT($ac_found) -fi -# ac_found is now "yes" if string.h exists and declares the mem* -# functions. If not, see if memory.h exists and include that -# as well. -if test $ac_found = no; then -AC_CHECK_HEADER(memory,h. [AC_DEFINE(NEED_MEMORY_H)]) -fi - -AC_CACHE_CHECK(whether provides prototypes, -bn_cv_header_stdio_protos, -[AC_EGREP_HEADER(printf, stdio.h, bn_cv_header_stdio_protos=yes, bn_cv_header_stdio_protos=no) -]) -if test $bn_cv_header_stdio_protos = no; then - AC_DEFINE(NO_STDIO_PROTOS) -fi - fi # ^^ End of non-ANSI header brokenness tests (first part) -AC_CACHE_CHECK(whether declares mem* wrong., -bn_cv_header_mem_broken, -[AC_EGREP_HEADER(memcpy.*char, string.h, bn_cv_header_mem_broken=yes, bn_cv_header_mem_broken=no) -]) -if test $bn_cv_header_mem_broken = yes; then - AC_DEFINE(MEM_PROTOS_BROKEN) -fi - -# SunOS 4.1.x acc's is broken -AC_CACHE_CHECK(whether is broken and needs , -bn_cv_header_assert_needs_stdio, -[AC_EGREP_CPP(stderr, -[#include -assert(foo) -], bn_cv_header_assert_needs_stdio=yes, bn_cv_header_assert_needs_stdio=no) -]) -if test $bn_cv_header_assert_needs_stdio = yes; then - AC_DEFINE(ASSERT_NEEDS_STDIO) -fi - -AC_CACHE_CHECK(whether is broken and needs , -bn_cv_header_assert_needs_stdlib, -[AC_EGREP_CPP(exit, -[#include -assert(foo) -], bn_cv_header_assert_needs_stdlib=yes, bn_cv_header_assert_needs_stdlib=no) -]) -if test $bn_cv_header_assert_needs_stdlib = yes; then - AC_DEFINE(ASSERT_NEEDS_STDLIB) -fi - # Check that we have explicitly. AC_CHECK_HEADERS(sys/time.h) AC_HEADER_TIME diff --git a/libs/libzrtp/third_party/bnlib/germtest.c b/libs/libzrtp/third_party/bnlib/germtest.c index 71873a1a22..826de77174 100644 --- a/libs/libzrtp/third_party/bnlib/germtest.c +++ b/libs/libzrtp/third_party/bnlib/germtest.c @@ -22,9 +22,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include /* For malloc() */ diff --git a/libs/libzrtp/third_party/bnlib/kludge.h b/libs/libzrtp/third_party/bnlib/kludge.h index 184a24eef5..3d84a1f346 100644 --- a/libs/libzrtp/third_party/bnlib/kludge.h +++ b/libs/libzrtp/third_party/bnlib/kludge.h @@ -15,28 +15,10 @@ * Some compilers complain about #if FOO if FOO isn't defined, * so do the ANSI-mandated thing explicitly... */ -#ifndef ASSERT_NEEDS_STDIO -#define ASSERT_NEEDS_STDIO 0 -#endif -#ifndef ASSERT_NEEDS_STDLIB -#define ASSERT_NEEDS_STDLIB 0 -#endif #ifndef NO_STDLIB_H #define NO_STDLIB_H 0 #endif -/* SunOS 4.1.x needs "stderr" defined, and "exit" declared... */ -#ifdef assert -#if ASSERT_NEEDS_STDIO -#include -#endif -#if ASSERT_NEEDS_STDLIB -#if !NO_STDLIB_H -#include -#endif -#endif -#endif - #ifndef NO_MEMMOVE #define NO_MEMMOVE 0 #endif @@ -51,43 +33,6 @@ #define memcpy(dest,src,len) bcopy(src,dest,len) #endif -#ifndef MEM_PROTOS_BROKEN -#define MEM_PROTOS_BROKEN 0 -#endif -#if MEM_PROTOS_BROKEN -#define memcpy(d,s,l) memcpy((void *)(d), (void const *)(s), l) -#define memmove(d,s,l) memmove((void *)(d), (void const *)(s), l) -#define memcmp(d,s,l) memcmp((void const *)(d), (void const *)(s), l) -#define memset(d,v,l) memset((void *)(d), v, l) -#endif - -/* - * If there are no prototypes for the stdio functions, use these to - * reduce compiler warnings. Uses EOF as a giveaway to indicate - * that was #included. - */ -#ifndef NO_STDIO_PROTOS -#define NO_STDIO_PROTOS 0 -#endif -#if NO_STDIO_PROTOS /* Missing prototypes for "simple" functions */ -#ifdef EOF -#ifdef __cplusplus -extern "C" { -#endif -int (puts)(char const *); -int (fputs)(char const *, FILE *); -int (fflush)(FILE *); -int (printf)(char const *, ...); -int (fprintf)(FILE *, char const *, ...); -/* If we have a sufficiently old-fashioned stdio, it probably uses these... */ -int (_flsbuf)(int, FILE *); -int (_filbuf)(FILE *); -#ifdef __cplusplus -} -#endif -#endif /* EOF */ -#endif /* NO_STDIO_PROTOS */ - /* * Borland C seems to think that it's a bad idea to decleare a * structure tag and not declare the contents. I happen to think diff --git a/libs/libzrtp/third_party/bnlib/lbn16.c b/libs/libzrtp/third_party/bnlib/lbn16.c index 36c98b8e73..6e00a020e8 100644 --- a/libs/libzrtp/third_party/bnlib/lbn16.c +++ b/libs/libzrtp/third_party/bnlib/lbn16.c @@ -85,9 +85,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -100,9 +97,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn.h" #include "lbn16.h" diff --git a/libs/libzrtp/third_party/bnlib/lbn32.c b/libs/libzrtp/third_party/bnlib/lbn32.c index 6d3cd35454..996cccdc61 100644 --- a/libs/libzrtp/third_party/bnlib/lbn32.c +++ b/libs/libzrtp/third_party/bnlib/lbn32.c @@ -85,9 +85,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -100,9 +97,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn.h" #include "lbn32.h" diff --git a/libs/libzrtp/third_party/bnlib/lbn64.c b/libs/libzrtp/third_party/bnlib/lbn64.c index 3eb3cee596..c0f659ee3c 100644 --- a/libs/libzrtp/third_party/bnlib/lbn64.c +++ b/libs/libzrtp/third_party/bnlib/lbn64.c @@ -85,9 +85,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -100,9 +97,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "lbn.h" #include "lbn64.h" diff --git a/libs/libzrtp/third_party/bnlib/lbnmem.c b/libs/libzrtp/third_party/bnlib/lbnmem.c index a2194c09ae..06ab8a2ce5 100644 --- a/libs/libzrtp/third_party/bnlib/lbnmem.c +++ b/libs/libzrtp/third_party/bnlib/lbnmem.c @@ -32,9 +32,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_STDLIB_H #include /* For malloc() & co. */ @@ -49,9 +46,6 @@ void free(); #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #ifndef DBMALLOC #define DBMALLOC 0 diff --git a/libs/libzrtp/third_party/bnlib/sieve.c b/libs/libzrtp/third_party/bnlib/sieve.c index 033cb117df..697e62652f 100644 --- a/libs/libzrtp/third_party/bnlib/sieve.c +++ b/libs/libzrtp/third_party/bnlib/sieve.c @@ -108,9 +108,6 @@ #ifndef HAVE_STRINGS_H #define HAVE_STRINGS_H 0 #endif -#ifndef NEED_MEMORY_H -#define NEED_MEMORY_H 0 -#endif #if !NO_ASSERT_H #include @@ -127,9 +124,6 @@ #elif HAVE_STRINGS_H #include #endif -#if NEED_MEMORY_H -#include -#endif #include "bn.h" #include "sieve.h" diff --git a/libs/libzrtp/third_party/bnlib/test/kludge.h b/libs/libzrtp/third_party/bnlib/test/kludge.h index 779e5aa1fe..695db0b653 100644 --- a/libs/libzrtp/third_party/bnlib/test/kludge.h +++ b/libs/libzrtp/third_party/bnlib/test/kludge.h @@ -24,40 +24,6 @@ #define raise(sig) kill(getpid(),sig) #endif -/* - * If there are no prototypes for the stdio functions, to reduce - * compiler warnings include these... conditional on EOF being - * defined (a giveaway that was #included). - */ -#if defined(EOF) - -#if NO_STDIO_PROTOS /* Missing prototypes for "simple" functions */ -int (puts)(char const *); -int (fputs)(char const *, FILE *); -void (rewind)(FILE *); -int (fflush)(FILE *); -int (fclose)(FILE *); -int (printf)(char const *, ...); -int (fprintf)(FILE *, char const *, ...); -int (fseek)(FILE *, long, int); -int (remove)(char const *); -int (rename)(char const *, char const *); -void (perror)(char const *); -int (system)(char const *); /* Really in , but this'll do... */ -int (pclose)(FILE *); -/* If we have a sufficiently old-fashioned stdio, it probably uses these... */ -int (_flsbuf)(int, FILE *); -int (_filbuf)(FILE *); -int (ungetc)(int, FILE *); -size_t (fread)(char *, size_t, size_t, FILE *); -size_t (fwrite)(char const *, size_t, size_t, FILE *); -#if defined(va_start) || defined(va_arg) || defined(va_end) -int (vfprintf)(FILE *, char const *, ...); -#endif -#endif /* NO_STDIO_PROTOS */ - -#endif /* EOF */ - /* * Make Microsoft Visual C shut the hell up about a few things... * Warning 4116 complains about the alignof() macro, saying: