mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into reorg

Browse source
This commit is contained in:
Joey Hess 2011-03-16 12:08:24 -04:00
commit e31eb44171
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Touch.hsc
View file

@ -22,6 +22,10 @@ import Foreign.C
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE >= 200809L
#endif
data TimeSpec = TimeSpec CTime CLong data TimeSpec = TimeSpec CTime CLong
instance Storable TimeSpec where instance Storable TimeSpec where

17
doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn Normal file
View file

@ -0,0 +1,17 @@
It seems that commit bc5c54c987f548505a3877e8a0e460abe0b2a081 introduced some linux specific things...
<pre>
hsc2hs Touch.hsc
Touch.hsc: In function ‘main’:
Touch.hsc:46: error: ‘UTIME_OMIT’ undeclared (first use in this function)
Touch.hsc:46: error: (Each undeclared identifier is reported only once
Touch.hsc:46: error: for each function it appears in.)
Touch.hsc:48: error: ‘UTIME_NOW’ undeclared (first use in this function)
Touch.hsc:67: error: ‘AT_FDCWD’ undeclared (first use in this function)
Touch.hsc:68: error: ‘AT_SYMLINK_NOFOLLOW’ undeclared (first use in this function)
compiling Touch_hsc_make.c failed
command was: /usr/bin/gcc -c -m32 -I/Library/Frameworks/GHC.framework/Versions/612/usr/lib/ghc-6.12.3/include/ Touch_hsc_make.c -o Touch_hsc_make.o
make: *** [Touch.hs] Error 1
</pre>
I dug around the OSX documentation and fcntl.h header file and it seems that UTIME_OMIT, UTIME_NOW, AT_FDCWD and AT_SYMLINK_NOFOLLOW aren't defined (at least on OSX). I suspect the BSD's in general will have problems compiling git-annex.