ENH: Windows fixes

This commit is contained in:
Andy Cedilnik 2005-12-28 11:00:46 -05:00
parent bc1548b236
commit 3a945312ac
8 changed files with 16 additions and 18 deletions

View File

@ -230,7 +230,9 @@ SET (MAKEDEV_THREE_ARGS 0)
#SET (NEED_BASENAME 0) #SET (NEED_BASENAME 0)
#SET (NEED_DIRNAME 0) #SET (NEED_DIRNAME 0)
#SET (NEED_FNMATCH 1) #SET (NEED_FNMATCH 1)
#SET (NEED_MAKEDEV 1) IF(UNIX)
SET (NEED_MAKEDEV 1)
ENDIF(UNIX)
#SET (NEED_SNPRINTF 0) #SET (NEED_SNPRINTF 0)
#SET (NEED_STRDUP 0) #SET (NEED_STRDUP 0)
#SET (NEED_STRLCPY 0) #SET (NEED_STRLCPY 0)
@ -269,8 +271,11 @@ FOREACH(hfile libtar.h tar.h compat/compat.h)
${LIBTAR_BINARY_DIR}/libtar/${outname} @ONLY IMMEDIATE) ${LIBTAR_BINARY_DIR}/libtar/${outname} @ONLY IMMEDIATE)
ENDFOREACH(hfile) ENDFOREACH(hfile)
CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/internal.h FOREACH(hfile internal.h filesystem.h)
${LIBTAR_BINARY_DIR}/libtarint/internal.h @ONLY IMMEDIATE) GET_FILENAME_COMPONENT(outname "${hfile}" NAME)
CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/${hfile}
${LIBTAR_BINARY_DIR}/libtarint/${outname} @ONLY IMMEDIATE)
ENDFOREACH(hfile)
SET(libtar_SRC SET(libtar_SRC
append.c append.c
@ -344,13 +349,6 @@ ENDIF(NOT HAVE_FNMATCH)
#ENDIF(NOT HAVE_GLOB) #ENDIF(NOT HAVE_GLOB)
IF(WIN32)
SET(NEED_MAKEDEV 0)
ELSE(WIN32)
SET(NEED_MAKEDEV 1)
ENDIF(WIN32)
CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in
${LIBTAR_BINARY_DIR}/libtar/config.h) ${LIBTAR_BINARY_DIR}/libtar/config.h)

View File

@ -34,7 +34,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
//#include <sys/param.h> //#include <sys/param.h>
#include <compat.h> #include <libtar/compat.h>
char * char *
openbsd_basename(path) openbsd_basename(path)

View File

@ -34,7 +34,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
//#include <sys/param.h> //#include <sys/param.h>
#include <compat.h> #include <libtar/compat.h>
char * char *
openbsd_dirname(path) openbsd_dirname(path)

View File

@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp
* Compares a filename or pathname to a pattern. * Compares a filename or pathname to a pattern.
*/ */
#include <config.h> #include <libtar/config.h>
#include <stdio.h> #include <stdio.h>
@ -61,7 +61,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp
# include <ctype.h> # include <ctype.h>
#endif #endif
#include <compat.h> #include <libtar/compat.h>
#define EOS '\0' #define EOS '\0'

View File

@ -40,7 +40,7 @@
* *
**************************************************************/ **************************************************************/
#include <config.h> #include <libtar/config.h>
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)

View File

@ -17,7 +17,7 @@
#ifndef _MSC_VER #ifndef _MSC_VER
#include <sys/param.h> #include <sys/param.h>
#else #else
#include <compat.h> #include <libtar/compat.h>
#endif #endif
#ifndef WIN32 #ifndef WIN32

View File

@ -14,7 +14,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <filesystem.h> #include <libtarint/filesystem.h>
kwDirectory * kwOpenDir(const char* name) kwDirectory * kwOpenDir(const char* name)

View File

@ -15,7 +15,7 @@
#include <stdio.h> #include <stdio.h>
#include <libtar/compat.h> #include <libtar/compat.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#include <filesystem.h> #include <libtarint/filesystem.h>
#else #else
#include <sys/param.h> #include <sys/param.h>
#include <dirent.h> #include <dirent.h>