From 687d231c5fab1e917f93e3b63b48b7b0e97882e3 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 4 Jul 2005 11:16:03 +0000
Subject: [PATCH] Fixed the rc build. Sorry for the inconveniences.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13421 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tools/rc/Jamfile           |  4 ++++
 src/tools/rc/R5Compatibility.h | 22 ++++++++++++++++++++++
 src/tools/rc/rc.cpp            |  6 ------
 3 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 src/tools/rc/R5Compatibility.h

diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index 4304b2bad7..5d1778f67b 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -4,6 +4,10 @@ GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
 
 SubDirC++Flags -Wno-sign-compare -Wno-unused ;
 
+local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ;
+SubDirCcFlags -include $(r5Compatibility) ;
+SubDirC++Flags -include $(r5Compatibility) ;
+
 StaticLibrary rdef :
 	compile.cpp decompile.cpp lexer.l parser.y rdef.cpp ;
 
diff --git a/src/tools/rc/R5Compatibility.h b/src/tools/rc/R5Compatibility.h
new file mode 100644
index 0000000000..5e7e850500
--- /dev/null
+++ b/src/tools/rc/R5Compatibility.h
@@ -0,0 +1,22 @@
+#ifndef RC_R5_COMPATIBILITY_H
+#define RC_R5_COMPATIBILITY_H
+
+#ifndef __HAIKU__
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern size_t	strnlen(const char *string, size_t count);
+extern size_t	strlcat(char *dest, const char *source, size_t length);
+extern size_t	strlcpy(char *dest, const char *source, size_t length);
+
+#ifdef __cplusplus
+}	// extern "C"
+#endif
+
+#endif // !__HAIKU__
+
+#endif	// RC_R5_COMPATIBILITY_H
diff --git a/src/tools/rc/rc.cpp b/src/tools/rc/rc.cpp
index 5ca7ad1162..f64f1c9b0a 100644
--- a/src/tools/rc/rc.cpp
+++ b/src/tools/rc/rc.cpp
@@ -43,12 +43,6 @@ static char sOutputFile[B_PATH_NAME_LENGTH] = { 0 };
 static char *sFirstInputFile = NULL;
 
 
-#ifndef __HAIKU__
-extern "C" size_t	strlcat(char *dest, const char *source, size_t length);
-extern "C" size_t	strlcpy(char *dest, const char *source, size_t length);
-#endif
-
-
 void
 warn(const char *format, ...)
 {