[Cmake-commits] [cmake-commits] king committed append.c 1.13 1.14 decode.c 1.5 1.6 extract.c 1.14 1.15 libtar.c 1.18 1.19 util.c 1.7 1.8 wrapper.c 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmtar
In directory public:/mounts/ram/cvs-serv31837/Utilities/cmtar

Modified Files:
	append.c decode.c extract.c libtar.c util.c wrapper.c 
Log Message:
COMP: Use HAVE_SYS_PARAM_H properly in libtar

The value is computed by a try-compile for libtar.  This teaches the
sources to actually use the result.


Index: decode.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/decode.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** decode.c	3 Feb 2006 16:48:43 -0000	1.5
--- decode.c	10 Jun 2009 15:49:01 -0000	1.6
***************
*** 18,22 ****
  # include <libtar/compat.h>
  #else
! # include <sys/param.h>
  #endif
  
--- 18,24 ----
  # include <libtar/compat.h>
  #else
! # ifdef HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! # endif
  #endif
  

Index: libtar.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/libtar.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** libtar.c	27 Sep 2007 18:44:11 -0000	1.18
--- libtar.c	10 Jun 2009 15:49:02 -0000	1.19
***************
*** 20,24 ****
  #include <io.h>
  #else
! #include <sys/param.h>
  #endif
  
--- 20,26 ----
  #include <io.h>
  #else
! # ifdef HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! # endif
  #endif
  

Index: util.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/util.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** util.c	16 Sep 2008 21:40:47 -0000	1.7
--- util.c	10 Jun 2009 15:49:02 -0000	1.8
***************
*** 24,28 ****
  #include <direct.h>
  #else
! #include <sys/param.h>
  #endif
  
--- 24,30 ----
  #include <direct.h>
  #else
! # ifdef HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! # endif
  #endif
  

Index: wrapper.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/wrapper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** wrapper.c	9 Feb 2006 14:34:46 -0000	1.9
--- wrapper.c	10 Jun 2009 15:49:02 -0000	1.10
***************
*** 18,22 ****
  #include <libtar/compat.h>
  #if defined(HAVE_SYS_PARAM_H)
! #include <sys/param.h>
  #endif
  #if defined(HAVE_DIRENT_H)
--- 18,22 ----
  #include <libtar/compat.h>
  #if defined(HAVE_SYS_PARAM_H)
! # include <sys/param.h>
  #endif
  #if defined(HAVE_DIRENT_H)

Index: extract.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/extract.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** extract.c	4 Dec 2006 22:26:40 -0000	1.14
--- extract.c	10 Jun 2009 15:49:01 -0000	1.15
***************
*** 29,33 ****
  #else
  # include <utime.h>
! # include <sys/param.h>
  #endif
  
--- 29,35 ----
  #else
  # include <utime.h>
! # ifdef HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! # endif
  #endif
  

Index: append.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/append.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** append.c	23 May 2006 16:38:22 -0000	1.13
--- append.c	10 Jun 2009 15:49:01 -0000	1.14
***************
*** 19,23 ****
  # include <libtar/compat.h>
  #else
! # include <sys/param.h>
  #endif
  #include <libtar/compat.h>
--- 19,25 ----
  # include <libtar/compat.h>
  #else
! # ifdef HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! # endif
  #endif
  #include <libtar/compat.h>