gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Portability

Browse Source 
- Modified util.cpp to allow clean compilation on Solaris.
This commit is contained in:
Paul Beckingham
2009-03-04 09:37:00 -05:00
parent d573599a7e
commit 9988ecec5e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/util.cpp
View File

@@ -29,10 +29,12 @@
#include <string> #include <string>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <pwd.h> #include <pwd.h>
#include <errno.h>
#include "Date.h" #include "Date.h"
#include "Table.h" #include "Table.h"
#include "task.h" #include "task.h"
@@ -335,20 +337,20 @@ std::string expandPath (const std::string& in)
#ifdef SOLARIS #ifdef SOLARIS
int flock (int fd, int operation) int flock (int fd, int operation)
{ {
struct flock flock; struct flock fl;
switch (operation & ~LOCK_NB) switch (operation & ~LOCK_NB)
{ {
case LOCK_SH: case LOCK_SH:
flock.l_type = F_RDLCK; fl.l_type = F_RDLCK;
break; break;
case LOCK_EX: case LOCK_EX:
flock.l_type = F_WRLCK; fl.l_type = F_WRLCK;
break; break;
case LOCK_UN: case LOCK_UN:
flock.l_type = F_UNLCK; fl.l_type = F_UNLCK;
break; break;
default: default:
@@ -356,11 +358,11 @@ int flock (int fd, int operation)
return -1; return -1;
} }
flock.l_whence = 0; fl.l_whence = 0;
flock.l_start = 0; fl.l_start = 0;
flock.l_len = 0; fl.l_len = 0;
return fcntl (fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &flock); return fcntl (fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &fl);
} }
#endif #endif