From 20778dd434bdf65a4725ed56a6f8a6c4b24a8e1f Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Sat, 18 May 2013 17:03:08 +0200 Subject: [PATCH] Removed the definition of basename, which confuses an existing system one. --- misc.cc | 16 ++++++++-------- misc.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) 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); -- 2.20.1