projects / packages / gamin.git / blame
| Commit | Line | Data |
|---|---|---|
| 2e07ad5f MB |
1 | diff -up gamin-0.1.9/server/gam_channel.c.xxx gamin-0.1.9/server/gam_channel.c |
| 2 | --- gamin-0.1.9/server/gam_channel.c.xxx 2007-07-04 15:36:49.000000000 +0200 | |
| 3 | +++ gamin-0.1.9/server/gam_channel.c 2008-02-14 10:00:38.654849392 +0100 | |
| 4 | @@ -3,7 +3,6 @@ | |
| 5 | #include <unistd.h> | |
| 6 | #include <errno.h> | |
| 7 | #include <glib.h> | |
| 8 | -#include <sys/socket.h> | |
| 9 | #include <sys/stat.h> | |
| 10 | #include <sys/un.h> | |
| 11 | #include <sys/uio.h> | |
| 12 | @@ -12,6 +11,14 @@ | |
| 13 | #include "gam_channel.h" | |
| 14 | #include "gam_protocol.h" | |
| 15 | ||
| 16 | +#ifdef HAVE_LINUX | |
| 17 | + /* Workaround for undefined struct ucred */ | |
| 18 | + #define __USE_GNU | |
| 19 | +#endif | |
| 20 | + | |
| 21 | +#include <sys/socket.h> | |
| 22 | + | |
| 23 | + | |
| 24 | /* #define CHANNEL_VERBOSE_DEBUGGING */ | |
| 25 | /************************************************************************ | |
| 26 | * * | |
| 27 | diff -up gamin-0.1.9/libgamin/gam_api.c.xxx gamin-0.1.9/libgamin/gam_api.c | |
| 28 | --- gamin-0.1.9/libgamin/gam_api.c.xxx 2007-07-04 15:36:48.000000000 +0200 | |
| 29 | +++ gamin-0.1.9/libgamin/gam_api.c 2008-02-13 17:41:50.697896914 +0100 | |
| 30 | @@ -11,7 +11,6 @@ | |
| 31 | #include <fcntl.h> | |
| 32 | #include <errno.h> | |
| 33 | #include <sys/stat.h> | |
| 34 | -#include <sys/socket.h> | |
| 35 | #include <sys/un.h> | |
| 36 | #include <sys/uio.h> | |
| 37 | #include "fam.h" | |
| 38 | @@ -20,6 +19,14 @@ | |
| 39 | #include "gam_fork.h" | |
| 40 | #include "gam_error.h" | |
| 41 | ||
| 42 | +#ifdef HAVE_LINUX | |
| 43 | + /* Workaround for undefined struct ucred */ | |
| 44 | + #define __USE_GNU | |
| 45 | +#endif | |
| 46 | + | |
| 47 | +#include <sys/socket.h> | |
| 48 | + | |
| 49 | + | |
| 50 | #define TEST_DEBUG | |
| 51 | ||
| 52 | #define MAX_RETRIES 25 |