From e099459179557cb754cac5bc8bfb6dc8686a147d Mon Sep 17 00:00:00 2001 From: dwarning Date: Sun, 2 Dec 2007 21:56:44 +0000 Subject: [PATCH] no message --- src/frontend/inp.c | 1 + src/frontend/inpcom.c | 1 + src/misc/util.c | 4 ++-- src/misc/util.h | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/frontend/inp.c b/src/frontend/inp.c index 7a3ab692f..3e44a301a 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -39,6 +39,7 @@ $Id$ #include "completion.h" #include "variable.h" #include "breakp2.h" +#include "../misc/util.h" /* dirname() */ #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include new stuff */ diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 64298e34b..ada8e47f1 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -49,6 +49,7 @@ Author: 1985 Wayne A. Christopher #include "inpcom.h" #include "variable.h" +#include "../misc/util.h" /* dirname() */ #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include new stuff */ diff --git a/src/misc/util.c b/src/misc/util.c index 55e7482ec..97a1a4775 100644 --- a/src/misc/util.c +++ b/src/misc/util.c @@ -153,7 +153,7 @@ char * absolute_pathname(char *string, char *dot_path) #ifndef HAVE_DIRNAME -const char * +char * basename(const char *name) { const char *base; @@ -188,7 +188,7 @@ basename(const char *name) return base; } -const char * +char * dirname(const char *name) { static char *ret = NULL; diff --git a/src/misc/util.h b/src/misc/util.h index adba48c2d..c5fda318d 100644 --- a/src/misc/util.h +++ b/src/misc/util.h @@ -9,9 +9,9 @@ char *canonicalize_pathname(char *path); char *absolute_pathname(char *string, char *dot_path); -#ifdef _MSC_VER -const char *basename(const char *name); -const char *dirname(const char *name); +#ifndef HAVE_DIRNAME +char *basename(const char *name); +char *dirname(const char *name); #endif #endif