Fix for server/change.c breakage (and request for help)

Gerald Pfeifer gerald at pfeifer.com
Fri Feb 3 15:09:50 CST 2006


The following change to server/change.c

  revision 1.32
  date: 2006-01-30 18:46:00 +0000;  author: julliard;  state: Exp;  lines: +223 -15
  Mike McCormack <mike at codeweavers.com>
  server: Initial inotify support.

broke (all?) systems without pnotify support:

The second set of errors is addressed by the patch below.  If someone
else could look into how to best address the first set of errors, I'd 
really appreciate that.

  change.c: In function `inotify_poll_event':
  change.c:425: error: dereferencing pointer to incomplete type
  change.c:428: error: dereferencing pointer to incomplete type
  change.c:428: error: dereferencing pointer to incomplete type
  change.c: In function `inotify_adjust_changes':
  change.c:444: error: `IN_MOVED_FROM' undeclared (first use in this function)
  change.c:444: error: (Each undeclared identifier is reported only once
  change.c:444: error: for each function it appears in.)
  change.c:444: error: `IN_MOVED_TO' undeclared (first use in this function)
  change.c:444: error: `IN_DELETE' undeclared (first use in this function)
  change.c:444: error: `IN_CREATE' undeclared (first use in this function)
  change.c:446: error: `IN_DELETE_SELF' undeclared (first use in this function)
  change.c:448: error: `IN_ATTRIB' undeclared (first use in this function)
  change.c:450: error: `IN_MODIFY' undeclared (first use in this function)
  change.c:454: error: `IN_ACCESS' undeclared (first use in this function)
  gmake: *** [change.o] Error 1

Thanks,
Gerald

ChangeLog:
Render inotify_adjust_changes() just a stub on non-Linux systems.

Index: change.c
===================================================================
RCS file: /home/wine/wine/server/change.c,v
retrieving revision 1.32
diff -u -3 -p -r1.32 change.c
--- change.c	30 Jan 2006 18:46:00 -0000	1.32
+++ change.c	3 Feb 2006 21:02:21 -0000
@@ -436,6 +436,7 @@ static int inotify_get_info( struct fd *
 
 static void inotify_adjust_changes( struct dir *dir )
 {
+#ifdef linux
     int filter = dir->filter;
     unsigned int mask = 0;
     char link[32];
@@ -461,6 +462,7 @@ static void inotify_adjust_changes( stru
     dir->wd = inotify_add_watch( get_unix_fd( dir->inotify_fd ), link, mask );
     if (dir->wd != -1)
         set_fd_events( dir->inotify_fd, POLLIN );
+#endif
 }
 
 static struct fd *create_inotify_fd( struct dir *dir )



More information about the wine-devel mailing list