Ignore:
Timestamp:
Apr 29, 2013, 1:31:45 PM (7 years ago)
Author:
snc@…
Message:

gsoc11-statistics: rebase from trunk

Location:
branches/gsoc11-statistics/base
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/gsoc11-statistics/base

  • branches/gsoc11-statistics/base/src/darwintracelib1.0/Makefile

    r82923 r105638  
    22SHLIB_NAME=     darwintrace${SHLIB_SUFFIX}
    33INSTALLDIR=     ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
    4 
    5 test::
    64
    75include ../../Mk/macports.autoconf.mk
     
    2321        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    2422        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
     23
     24test::
  • branches/gsoc11-statistics/base/src/darwintracelib1.0/darwintrace.c

    r105085 r105638  
    10881088 * different anyway */
    10891089
    1090 #pragma pack(4)
    1091 struct dirent32 {
    1092         ino_t d_ino;                    /* file number of entry */
    1093         __uint16_t d_reclen;            /* length of this record */
    1094         __uint8_t  d_type;              /* file type, see below */
    1095         __uint8_t  d_namlen;            /* length of string in d_name */
    1096         char d_name[__DARWIN_MAXNAMLEN + 1];    /* name must be no longer than this */
    1097 };
    1098 #pragma pack()
     1090#if defined(__DARWIN_64_BIT_INO_T)
    10991091
    11001092struct dirent64  {
    11011093        __uint64_t  d_ino;      /* file number of entry */
    1102         __uint64_t  d_seekoff;  /* seek offset (optional, used by servers) */
     1094        __uint64_t  d_seekoff;  /* seek offset */
    11031095        __uint16_t  d_reclen;   /* length of this record */
    11041096        __uint16_t  d_namlen;   /* length of string in d_name */
    1105         __uint8_t   d_type;     /* file type, see below */
     1097        __uint8_t   d_type;     /* file type */
    11061098        char      d_name[__DARWIN_MAXPATHLEN]; /* entry name (up to MAXPATHLEN bytes) */
    11071099};
     
    11151107        if (-1 == fcntl(fd, F_GETPATH, dirname)) {
    11161108                errno = EBADF;
    1117                 return 0;
     1109                return -1;
    11181110        }
    11191111
     
    11441136}
    11451137
     1138#endif /* defined(__DARWIN_64_BIT_INO_T) */
     1139
     1140#pragma pack(4)
     1141struct dirent32 {
     1142        ino_t d_ino;            /* file number of entry */
     1143        __uint16_t d_reclen;    /* length of this record */
     1144        __uint8_t  d_type;      /* file type */
     1145        __uint8_t  d_namlen;    /* length of string in d_name */
     1146        char d_name[__DARWIN_MAXNAMLEN + 1]; /* name must be no longer than this */
     1147};
     1148#pragma pack()
     1149
    11461150int getdirentries(int fd, char *buf, int nbytes, long *basep) {
    11471151#define getdirentries(w,x,y,z) syscall(SYS_getdirentries, (w), (x), (y), (z))
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha2.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha2.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha256cmd.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha256cmd.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/registry2.0/receipt_sqlite.tcl

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.