- (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL

[openssh.git] / openbsd-compat / strsep.c

diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c
index 330d84ce151b26a36428561bbb3b4ebe51c019ab..b36eb8fdad704ec8dd4dd41998e66b17f4ceb7d6 100644 (file)
--- a/openbsd-compat/strsep.c
+++ b/openbsd-compat/strsep.c
@@ -1,6 +1,4 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
-
-/*     $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $      */
+/*     $OpenBSD: strsep.c,v 1.6 2005/08/08 08:05:37 espie Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -31,6 +29,8 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
+
 #include "includes.h"
 
 #if !defined(HAVE_STRSEP)
@@ -38,14 +38,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strsep.c   8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * Get next token from string *stringp, where tokens are possibly-empty
  * strings separated by characters from delim.