[Cmake-commits] [cmake-commits] hoffman committed archive.h 1.3 1.4 archive_entry.h 1.2 1.3 archive_read_open_fd.c 1.1 1.2 archive_read_open_file.c 1.1 1.2 archive_read_open_filename.c 1.1 1.2 archive_windows.h 1.2 1.3 archive_write_open_fd.c 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv11244/libarchive

Modified Files:
	archive.h archive_entry.h archive_read_open_fd.c 
	archive_read_open_file.c archive_read_open_filename.c 
	archive_windows.h archive_write_open_fd.c 
Log Message:
borland builds, but still has some link errors


Index: archive.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** archive.h	1 Nov 2009 17:41:17 -0000	1.3
--- archive.h	2 Nov 2009 15:51:27 -0000	1.4
***************
*** 62,67 ****
--- 62,72 ----
  #include <unistd.h>  /* ssize_t, uid_t, and gid_t */
  #endif
+ #if defined(__BORLANDC__)
+ #define __LA_INT64_T    __int64
+ #define __LA_SSIZE_T  long
+ #else
  #define __LA_INT64_T    int64_t
  #define __LA_SSIZE_T    ssize_t
+ #endif
  #define __LA_UID_T  uid_t
  #define __LA_GID_T  gid_t

Index: archive_read_open_file.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_read_open_file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_read_open_file.c	30 Oct 2009 17:09:56 -0000	1.1
--- archive_read_open_file.c	2 Nov 2009 15:51:28 -0000	1.2
***************
*** 98,102 ****
          mine->can_skip = 0;
  
! #if defined(__CYGWIN__)
      setmode(fileno(mine->f), O_BINARY);
  #elif defined(_WIN32)
--- 98,102 ----
          mine->can_skip = 0;
  
! #if defined(__CYGWIN__) || defined(__BORLANDC__)
      setmode(fileno(mine->f), O_BINARY);
  #elif defined(_WIN32)

Index: archive_read_open_fd.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_read_open_fd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_read_open_fd.c	30 Oct 2009 17:09:56 -0000	1.1
--- archive_read_open_fd.c	2 Nov 2009 15:51:28 -0000	1.2
***************
*** 102,106 ****
      } else
          mine->can_skip = 0;
! #if defined(__CYGWIN__)
      setmode(mine->fd, O_BINARY);
  #elif defined(_WIN32)
--- 102,106 ----
      } else
          mine->can_skip = 0;
! #if defined(__CYGWIN__) || defined(__BORLANDC__)
      setmode(mine->fd, O_BINARY);
  #elif defined(_WIN32)

Index: archive_write_open_fd.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_write_open_fd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_write_open_fd.c	30 Oct 2009 17:09:59 -0000	1.1
--- archive_write_open_fd.c	2 Nov 2009 15:51:29 -0000	1.2
***************
*** 71,75 ****
      }
      mine->fd = fd;
! #if defined(__CYGWIN__)
      setmode(mine->fd, O_BINARY);
  #elif defined(_WIN32)
--- 71,75 ----
      }
      mine->fd = fd;
! #if defined(__CYGWIN__) || defined(__BORLANDC__)
      setmode(mine->fd, O_BINARY);
  #elif defined(_WIN32)

Index: archive_windows.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_windows.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** archive_windows.h	1 Nov 2009 17:41:17 -0000	1.2
--- archive_windows.h	2 Nov 2009 15:51:29 -0000	1.3
***************
*** 118,122 ****
--- 118,124 ----
  #define rmdir       __la_rmdir
  #define stat(path,stref)        __la_stat(path,stref)
+ #ifndef __BORLANDC__
  #define strdup      _strdup
+ #endif
  #define tzset       _tzset
  #define umask       _umask

Index: archive_read_open_filename.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_read_open_filename.c	30 Oct 2009 17:09:56 -0000	1.1
--- archive_read_open_filename.c	2 Nov 2009 15:51:28 -0000	1.2
***************
*** 100,104 ****
          filename = ""; /* Normalize NULL to "" */
          fd = 0;
! #if defined(__CYGWIN__)
          setmode(0, O_BINARY);
  #elif defined(_WIN32)
--- 100,104 ----
          filename = ""; /* Normalize NULL to "" */
          fd = 0;
! #if defined(__CYGWIN__) || defined(__BORLANDC__)
          setmode(0, O_BINARY);
  #elif defined(_WIN32)

Index: archive_entry.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_entry.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** archive_entry.h	1 Nov 2009 17:41:17 -0000	1.2
--- archive_entry.h	2 Nov 2009 15:51:28 -0000	1.3
***************
*** 59,63 ****
--- 59,67 ----
  # include <unistd.h>
  #endif
+ #if defined(__BORLANDC__)
+ #define __LA_INT64_T    __int64
+ #else
  #define __LA_INT64_T    int64_t
+ #endif
  #define __LA_UID_T  uid_t
  #define __LA_GID_T  gid_t