storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use our own inotify headers if the system does not have them

Browse Source 
* Don't rely on signal.h to include linux/types.h (for __u32 definition)
This commit is contained in:
Justin Maggard 2009-02-11 08:44:24 +00:00
parent 0d3505656d
commit 8de8a8dc50
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
genconfig.sh
View File

@ -138,6 +138,14 @@ echo " * of BSD daemon() */" >> ${CONFIGFILE}
echo "#define USE_DAEMON" >> ${CONFIGFILE} echo "#define USE_DAEMON" >> ${CONFIGFILE}
echo "" >> ${CONFIGFILE} echo "" >> ${CONFIGFILE}
echo "/* Enable if the system inotify.h exists. Otherwise our own inotify.h will be used. */" >> ${CONFIGFILE}
if [ -f /usr/include/sys/inotify.h ]; then
echo "#define HAVE_INOTIFY_H" >> ${CONFIGFILE}
else
echo "/*#define HAVE_INOTIFY_H*/" >> ${CONFIGFILE}
fi
echo "" >> ${CONFIGFILE}
echo "/* Experimental UPnP Events support. */" >> ${CONFIGFILE} echo "/* Experimental UPnP Events support. */" >> ${CONFIGFILE}
echo "#define ENABLE_EVENTS" >> ${CONFIGFILE} echo "#define ENABLE_EVENTS" >> ${CONFIGFILE}
echo "" >> ${CONFIGFILE} echo "" >> ${CONFIGFILE}

5
inotify.c
View File

@ -7,7 +7,12 @@
#include <libgen.h> #include <libgen.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_INOTIFY_H
#include <sys/inotify.h> #include <sys/inotify.h>
#else
#include "inotify-includes/inotify.h"
#include "inotify-includes/inotify-syscalls.h"
#endif
#include "upnpglobalvars.h" #include "upnpglobalvars.h"
#include "utils.h" #include "utils.h"

3
upnpglobalvars.h
View File

@ -8,7 +8,7 @@
#define __UPNPGLOBALVARS_H__ #define __UPNPGLOBALVARS_H__
#include <time.h> #include <time.h>
#include <signal.h> // Defines __u32 #include <linux/types.h> // Defines __u32
#include "minidlnatypes.h" #include "minidlnatypes.h"
#include "config.h" #include "config.h"
@ -54,7 +54,6 @@ extern struct runtime_vars_s runtime_vars;
extern int runtime_flags; extern int runtime_flags;
#define INOTIFYMASK 0x0001 #define INOTIFYMASK 0x0001
#define SYSUPTIMEMASK 0x0002 #define SYSUPTIMEMASK 0x0002
#define CHECKCLIENTIPMASK 0x0008
#define SETFLAG(mask) runtime_flags |= mask #define SETFLAG(mask) runtime_flags |= mask
#define GETFLAG(mask) runtime_flags & mask #define GETFLAG(mask) runtime_flags & mask