Remove outdated autoconf tests in bnlib

diff --git a/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c b/libs/libzrtp/third_party/bnlib/bignum-ARM/bntest16.c
index ccb5f2504ec813cfb5888619e37e59bf6b7097b7..c220d6e683ebb292e93bbc3fafd454499db5eedf 100644 (file)
--- 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 <stdio.h>
 
@@ -48,9 +45,6 @@ long strtol(const char *, char **, int);
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 671be5c7fceaa66cb6b4d64af4cd07830ec1696e..27e128c8d98bbaca2fcbd51c58e14b60d90081dc 100644 (file)
--- 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 <stdio.h> is missing prototypes (= lots of warnings!) */
-#define NO_STDIO_PROTOS 0
-
-/* Define if <assert.h> depends on <stdio.h> and breaks without it */
-#define ASSERT_NEEDS_STDIO 0
-/* Define if <assert.h> depends on <stdlib.h> and complains without it */
-#define ASSERT_NEEDS_STDLIB 0
-
-/*
- * Define if <string.h> 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 023c8905d776170497eeab43534411ce7571a473..6c5340e789825b6e9de25b59c2e449b8305ef5b4 100644 (file)
--- 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 <assert.h> needs "stderr" defined, and "exit" declared... */
-#ifdef assert
-#if ASSERT_NEEDS_STDIO
-#include <stdio.h>
-#endif
-#if ASSERT_NEEDS_STDLIB
-#if !NO_STDLIB_H
-#include <stdlib.h>
-#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 <stdio.h> 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 c28e9f2fc0f03700159f5cb0604399fb388af484..0b8d52e021aad686911a7f0d1763fd5abe563bd0 100644 (file)
--- 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 <assert.h>
@@ -99,9 +96,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 a25844c4c7220612bb417158df4ca083aa53924e..70094d5f310683d25a9d517e56285ec12b18b45a 100644 (file)
--- 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 <stdlib.h>    /* For malloc() & co. */
@@ -48,9 +45,6 @@ void free();
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 c783827b0848bc568b9f066108d1050130538576..d81ac6acaa4ffe1c55e57991e090a877ff883d3e 100644 (file)
--- 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 <assert.h>
@@ -44,9 +41,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 d7fd51ea2e018be675e10b4e4ac93bdb6d757c6f..d9daca0c976188b94c6a1f7a7cca1820e727959a 100644 (file)
--- 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 <assert.h>
@@ -44,9 +41,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 2c98b4b07d9af73bff6574c7b965b98a4010a100..841a277a4885d7698d0de893c1afb43b7b42aa7f 100644 (file)
--- 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 <assert.h>
@@ -44,9 +41,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 c526b8e359e68c0c74e7b27a405469a4dbd8fe89..1b5e5986f9773502df8505e03538fedcf0a83e31 100644 (file)
--- 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 <stdio.h> is missing prototypes (= lots of warnings!) */
-#define NO_STDIO_PROTOS 0
-
-/* Define if <assert.h> depends on <stdio.h> and breaks without it */
-#define ASSERT_NEEDS_STDIO 0
-/* Define if <assert.h> depends on <stdlib.h> and complains without it */
-#define ASSERT_NEEDS_STDLIB 0
-
-/*
- * Define if <string.h> 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 303a25b689b1cae78dfd99551bd3da993df0eb81..2e3693883503f816b02f0e65c926e5c7f63df60f 100644 (file)
--- 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 <stdio.h> is missing prototypes (= lots of warnings!) */
-#define NO_STDIO_PROTOS 0
-
-/* Define if <assert.h> depends on <stdio.h> and breaks without it */
-#define ASSERT_NEEDS_STDIO 0
-/* Define if <assert.h> depends on <stdlib.h> and complains without it */
-#define ASSERT_NEEDS_STDLIB 0
-
-/*
- * Define if <string.h> 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 9068f0fbb982c4fa9f7fdb7bd9414df68fc6a1e0..19ccbd0ac9ddcab4b4026081f7064e83c0f7384f 100644 (file)
--- 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 <stdio.h>
 
@@ -55,9 +52,6 @@ long strtol(const char *, char **, int);
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 987dc77f3472aafd7cfdc9f7a847a20c8d922eda..6cc9ff27c5555c587b7b00183fdafd754876a8b8 100644 (file)
--- 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 <stdio.h>
 
@@ -55,9 +52,6 @@ long strtol(const char *, char **, int);
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 01fda81891e33be95221a9230cc68068fba3c8ba..dbc4fd6c0d90a56554a68f204b9c4df1c8b3dd6e 100644 (file)
--- 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 <stdio.h>
 
@@ -55,9 +52,6 @@ long strtol(const char *, char **, int);
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 917762ec4e2ff66ae40bcb0f21bf2a1fe2b4f6b1..0520be70a4c7bdad39529e839cd7715169a1f87f 100644 (file)
--- 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 <stdio.h> 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 <string.h> 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 <assert.h> is broken
-AC_CACHE_CHECK(whether <assert.h> is broken and needs <stdio.h>,
-bn_cv_header_assert_needs_stdio,
-[AC_EGREP_CPP(stderr,
-[#include <assert.h>
-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 <assert.h> is broken and needs <stdlib.h>,
-bn_cv_header_assert_needs_stdlib,
-[AC_EGREP_CPP(exit,
-[#include <assert.h>
-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 <sys/time.h> 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 71873a1a22b57d80d03477d73e80c3ffc4074dc0..826de77174546ffee2c720a011566b30cc822b6d 100644 (file)
--- 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 <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#endif
 
 #include <stdlib.h>    /* For malloc() */
 

diff --git a/libs/libzrtp/third_party/bnlib/kludge.h b/libs/libzrtp/third_party/bnlib/kludge.h
index 184a24eef5be4137c698f7b2791270f4daf9aa80..3d84a1f3464b7ff0d664333d7473ecf7b6a217c0 100644 (file)
--- 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 <assert.h> needs "stderr" defined, and "exit" declared... */
-#ifdef assert
-#if ASSERT_NEEDS_STDIO
-#include <stdio.h>
-#endif
-#if ASSERT_NEEDS_STDLIB
-#if !NO_STDLIB_H
-#include <stdlib.h>
-#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 <stdio.h> 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 36c98b8e7344b20c3cd6b54692134e50376568a5..6e00a020e8b6ee3cf84b44c5742d3b26f0035cf1 100644 (file)
--- 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 <assert.h>
@@ -100,9 +97,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 6d3cd3545421c6bda39a7a2af4334ac3e78a56b4..996cccdc612219e28e2d96accda959557eb4bb41 100644 (file)
--- 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 <assert.h>
@@ -100,9 +97,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 3eb3cee5961da36a2431a5f9b289d1194771b8c6..c0f659ee3c73c489555e42446485027e0d7c6a1c 100644 (file)
--- 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 <assert.h>
@@ -100,9 +97,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 a2194c09ae85ee159036844f55ae646f9f8caf9c..06ab8a2ce5fe6f364befb9e96a0f29a7ab3d2a85 100644 (file)
--- 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 <stdlib.h>    /* For malloc() & co. */
@@ -49,9 +46,6 @@ void free();
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 033cb117df579d420e84359c898fc1511d8ec5c5..697e62652ffcd9c0331494e5b648717bbb7ead65 100644 (file)
--- 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 <assert.h>
@@ -127,9 +124,6 @@
 #elif HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if NEED_MEMORY_H
-#include <memory.h>
-#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 779e5aa1fe7b109ca4aa77f12b3700d6f7551c40..695db0b653e3c478f2437eb5cea8059526c2c93c 100644 (file)
--- 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 <stdio.h> 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 <stdlib.h>, 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: