[vlc-commits] Remove getcwd() replacement

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 11 18:51:11 2011 +0300| [5e39cb277ca9a23a347ea592c4fed1381cb9ec9b] | committer: Rémi Denis-Courmont

Remove getcwd() replacement

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e39cb277ca9a23a347ea592c4fed1381cb9ec9b
---

 compat/getcwd.c      |   38 --------------------------------------
 configure.ac         |    2 +-
 include/vlc_fixups.h |    7 +------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/compat/getcwd.c b/compat/getcwd.c
deleted file mode 100644
index a238d05..0000000
--- a/compat/getcwd.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * getcwd.c: POSIX getcwd() replacement
- *****************************************************************************
- * Copyright © 2009 the VideoLAN project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-
-char *getcwd (char *buf, size_t size)
-{
-#ifdef UNDER_CE
-    /* Windows CE lacks any notion of working directory, so we just
-     * return an error, and set errno - oh wait, WinCE doesn't support
-     * errno either! */
-    (void) buf; (void) size;
-    return NULL;
-#else
-# error Unimplemented!
-#endif
-}
diff --git a/configure.ac b/configure.ac
index ccc77f9..e567c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,7 +567,7 @@ need_libc=false
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c694578..a223384 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -50,8 +50,7 @@ typedef struct
 
 #if !defined (HAVE_STRLCPY) || \
     !defined (HAVE_STRNDUP) || \
-    !defined (HAVE_STRNLEN) || \
-    !defined (HAVE_GETCWD)
+    !defined (HAVE_STRNLEN)
 # include <stddef.h> /* size_t */
 #endif
 
@@ -173,10 +172,6 @@ struct tm *localtime_r (const time_t *, struct tm *);
 #endif
 
 /* unistd.h */
-#ifndef HAVE_GETCWD
-char *getcwd (char *buf, size_t size);
-#endif
-
 #ifndef HAVE_GETPID
 pid_t getpid (void);
 #endif