From: Jon Trulson <jon@radscan.com>
Date: Mon, 9 Jul 2018 19:05:10 +0000 (-0600)
Subject: lib/DtSearch/raima/proto.h: fix OBSD build - don't redef system functions
X-Git-Tag: 2.3.0a~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=050fd75e808ba0f23378083ba59d06035597e75c;p=oweals%2Fcde.git

lib/DtSearch/raima/proto.h: fix OBSD build - don't redef system functions

Remove redeclaration of system functions (strlen, free, open, etc).
Use the system header files.  That's what they are for.
---

diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/lib/DtSearch/raima/dbtype.h
index 71da9fb3..5c7eea81 100644
--- a/cde/lib/DtSearch/raima/dbtype.h
+++ b/cde/lib/DtSearch/raima/dbtype.h
@@ -526,9 +526,9 @@ typedef struct page_entry {
 #define buff Buff.ptr
 
 #include <string.h>
-#ifndef _STRING_H
-#define _STRING_H
-#endif
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
 #include "proto.h"
 
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC dbtype.h */
diff --git a/cde/lib/DtSearch/raima/proto.h b/cde/lib/DtSearch/raima/proto.h
index 9a3cfc02..1148aaae 100644
--- a/cde/lib/DtSearch/raima/proto.h
+++ b/cde/lib/DtSearch/raima/proto.h
@@ -278,32 +278,4 @@ int  ctb_init(void);
 int  ctbl_alloc(void);
 void ctbl_free(void);
 
-/* System functions */
-#ifndef _STRING_H
-#ifndef linux
-  void CDECL memcpy(char *, char *, int);
-#endif
-  int  CDECL memcmp(char *, char *, int);
-  void CDECL memset(char *, char, int);
-
-  int CDECL strcmp(const char *, const char *);
-  char * CDECL strcpy(char *, const char *);
-  char * CDECL strcat(char *, const char *);
-  int CDECL strlen(const char *);
-  int CDECL strncmp(const char *, const char *, int);
-  char * CDECL strncpy(char *, const char *, int);
-  char * CDECL strchr(const char *, int);
-  char * CDECL strrchr(const char *, int);
-#endif
-
-void CDECL free(void *);  /* AIXV3 - DPG 07/05/90 */
-time_t CDECL time(long *);
-int CDECL write(int, char *, unsigned int);
-int CDECL read(int, char *, unsigned int);
-long CDECL lseek(int, long, int);
-int CDECL close(int);
-void CDECL exit(int);
-char * CDECL getenv(const char *);
-int CDECL locking(int, int, long);
-int CDECL unlink(const char *);
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC -f/usr/users/master/config/nonwin proto.h */