From 496c9e1413493b51fde112c8a8841956f0f008d8 Mon Sep 17 00:00:00 2001 From: beveloper Date: Sun, 20 Jun 2004 16:09:34 +0000 Subject: [PATCH] removed compile errors git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8075 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/bin/make/dir.c | 1 + src/apps/bin/make/glob/glob.c | 2 +- src/apps/bin/make/glob/glob.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apps/bin/make/dir.c b/src/apps/bin/make/dir.c index e862b9d06d..3f1a9a44f5 100644 --- a/src/apps/bin/make/dir.c +++ b/src/apps/bin/make/dir.c @@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA. */ #include "make.h" #include "hash.h" +#include "glob.h" #ifdef HAVE_DIRENT_H # include diff --git a/src/apps/bin/make/glob/glob.c b/src/apps/bin/make/glob/glob.c index 4bbf7bb013..9d09c1656f 100644 --- a/src/apps/bin/make/glob/glob.c +++ b/src/apps/bin/make/glob/glob.c @@ -175,7 +175,7 @@ extern void bcopy (); # define strcoll strcmp #endif -#if !defined HAVE_MEMPCPY && __GLIBC__ - 0 == 2 && __GLIBC_MINOR__ >= 1 +#if !defined __BEOS__ && !defined HAVE_MEMPCPY && __GLIBC__ - 0 == 2 && __GLIBC_MINOR__ >= 1 # define HAVE_MEMPCPY 1 # undef mempcpy # define mempcpy(Dest, Src, Len) __mempcpy (Dest, Src, Len) diff --git a/src/apps/bin/make/glob/glob.h b/src/apps/bin/make/glob/glob.h index 9f735fe8ae..db4b919d03 100644 --- a/src/apps/bin/make/glob/glob.h +++ b/src/apps/bin/make/glob/glob.h @@ -24,7 +24,7 @@ extern "C" { #undef __ptr_t #if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32 -# if !defined __GLIBC__ || !defined __P +# if !defined __GLIBC__ || !defined __P || !defined __PMT # undef __P # undef __PMT # define __P(protos) protos