<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[74369] trunk/base/src/darwintracelib1.0</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/74369">74369</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-12-14 03:05:07 -0800 (Tue, 14 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>only use stat64 and friends when available, as per jeremyhu's suggestion on the list</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcdarwintracelib10Makefile">trunk/base/src/darwintracelib1.0/Makefile</a></li>
<li><a href="#trunkbasesrcdarwintracelib10darwintracec">trunk/base/src/darwintracelib1.0/darwintrace.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcdarwintracelib10Makefile"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/Makefile (74368 => 74369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/Makefile        2010-12-14 10:54:46 UTC (rev 74368)
+++ trunk/base/src/darwintracelib1.0/Makefile        2010-12-14 11:05:07 UTC (rev 74369)
</span><span class="lines">@@ -7,8 +7,6 @@
</span><span class="cx"> include ../../Mk/macports.autoconf.mk
</span><span class="cx"> 
</span><span class="cx"> CFLAGS+= -fPIC
</span><del>-# will need to update this to cope with 64-bit inodes someday
-CPPFLAGS+= -D_DARWIN_NO_64_BIT_INODE
</del><span class="cx"> 
</span><span class="cx"> all:: ${SHLIB_NAME}
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10darwintracec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.c (74368 => 74369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.c        2010-12-14 10:54:46 UTC (rev 74368)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c        2010-12-14 11:05:07 UTC (rev 74369)
</span><span class="lines">@@ -38,6 +38,19 @@
</span><span class="cx"> #include &lt;config.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if HAVE_SYS_CDEFS_H
+#include &lt;sys/cdefs.h&gt;
+#endif
+#if defined(_DARWIN_FEATURE_64_BIT_INODE) &amp;&amp; !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
+/* The architecture we're building for has multiple versions of stat.
+   We need to undo sys/cdefs.h changes for _DARWIN_FEATURE_64_BIT_INODE */
+#undef  __DARWIN_64_BIT_INO_T
+#define __DARWIN_64_BIT_INO_T 0
+#undef  __DARWIN_SUF_64_BIT_INO_T
+#define __DARWIN_SUF_64_BIT_INO_T &quot;&quot;
+#undef _DARWIN_FEATURE_64_BIT_INODE
+#endif
+
</ins><span class="cx"> #ifdef HAVE_CRT_EXTERNS_H
</span><span class="cx"> #include &lt;crt_externs.h&gt;
</span><span class="cx"> #endif
</span><span class="lines">@@ -465,8 +478,6 @@
</span><span class="cx">  */
</span><span class="cx"> static int is_directory(const char * path)
</span><span class="cx"> {
</span><del>-/* will need to update this to cope with 64-bit inodes someday - for now, we
- build with -D_DARWIN_NO_64_BIT_INODE */
</del><span class="cx"> #define stat(path, sb) syscall(SYS_stat, path, sb)
</span><span class="cx">         struct stat s;
</span><span class="cx">         if(stat(path, &amp;s)==-1)
</span><span class="lines">@@ -922,6 +933,8 @@
</span><span class="cx"> #undef stat
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if defined(__DARWIN_64_BIT_INO_T) &amp;&amp; !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
+
</ins><span class="cx"> int stat64(const char * path, struct stat64 * sb)
</span><span class="cx"> {
</span><span class="cx"> #define stat64(path, sb) syscall(SYS_stat64, path, sb)
</span><span class="lines">@@ -950,6 +963,9 @@
</span><span class="cx">     return stat64(path, sb);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#endif /* defined(__DARWIN_64_BIT_INO_T) &amp;&amp; !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE) */
+
+
</ins><span class="cx"> int lstat(const char * path, struct stat * sb)
</span><span class="cx"> {
</span><span class="cx"> #define lstat(path, sb) syscall(SYS_lstat, path, sb)
</span><span class="lines">@@ -973,6 +989,8 @@
</span><span class="cx"> #undef lstat
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if defined(__DARWIN_64_BIT_INO_T) &amp;&amp; !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
+
</ins><span class="cx"> int lstat64(const char * path, struct stat64 * sb)
</span><span class="cx"> {
</span><span class="cx"> #define lstat64(path, sb) syscall(SYS_lstat64, path, sb)
</span><span class="lines">@@ -1000,3 +1018,5 @@
</span><span class="cx"> {
</span><span class="cx">     return lstat64(path, sb);
</span><span class="cx"> }
</span><ins>+
+#endif /* defined(__DARWIN_64_BIT_INO_T) &amp;&amp; !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE) */
</ins></span></pre>
</div>
</div>

</body>
</html>