From: Francois Fleuret <francois@fleuret.org>
Date: Sat, 18 May 2013 15:03:08 +0000 (+0200)
Subject: Removed the definition of basename, which confuses an existing system one.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;ds=inline;p=folded-ctf.git

Removed the definition of basename, which confuses an existing system one.
---

diff --git a/misc.cc b/misc.cc
index a0dd057..93903be 100644
--- a/misc.cc
+++ b/misc.cc
@@ -28,14 +28,14 @@ using namespace std;
 
 #include "misc.h"
 
-char *basename(char *name) {
-  char *result = name;
-  while(*name) {
-    if(*name == '/') result = name + 1;
-    name++;
-  }
-  return result;
-}
+// char *basename(char *name) {
+  // char *result = name;
+  // while(*name) {
+    // if(*name == '/') result = name + 1;
+    // name++;
+  // }
+  // return result;
+// }
 
 char *next_word(char *buffer, char *r, int buffer_size) {
   char *s;
diff --git a/misc.h b/misc.h
index 7ad8cbf..5255739 100644
--- a/misc.h
+++ b/misc.h
@@ -99,7 +99,7 @@ inline scalar_t xi(scalar_t x) {
 
 scalar_t discrete_entropy(int *n, int nb);
 
-char *basename(char *name);
+// char *basename(char *name);
 
 char *next_word(char *buffer, char *r, int buffer_size);