net/samba3/patches/110-compile_fixes.patch

   1 Index: samba-3.0.37/source/popt/popt.c
   2 ===================================================================
   3 --- samba-3.0.37.orig/source/popt/popt.c        2011-04-11 23:35:04.000000000 +0200
   4 +++ samba-3.0.37/source/popt/popt.c     2011-04-11 23:35:10.000000000 +0200
   5 @@ -10,13 +10,14 @@
   6
   7  #include "system.h"
   8
   9 -#if HAVE_FLOAT_H
  10 +//#if HAVE_FLOAT_H
  11  #include <float.h>
  12 -#endif
  13 +//#endif
  14  #include <math.h>
  15
  16  #include "findme.h"
  17  #include "poptint.h"
  18 +#include "../include/config.h"
  19
  20  #ifdef MYDEBUG
  21  /*@unchecked@*/
  22 @@ -388,7 +389,7 @@
  23         sprintf(s, "%s/%s", con->execPath, item->argv[0]);
  24         argv[argc] = s;
  25      } else {
  26 -       argv[argc] = findProgramPath(item->argv[0]);
  27 +       argv[argc] = ""/*findProgramPath(item->argv[0])*/;
  28      }
  29      if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
  30
  31 @@ -1246,4 +1247,3 @@
  32
  33      return numargs;
  34  }
  35 -/*@=boundswrite@*/
  36 Index: samba-3.0.37/source/modules/vfs_default.c
  37 ===================================================================
  38 --- samba-3.0.37.orig/source/modules/vfs_default.c      2011-04-11 23:35:08.000000000 +0200
  39 +++ samba-3.0.37/source/modules/vfs_default.c   2011-04-11 23:35:10.000000000 +0200
  40 @@ -977,7 +977,7 @@
  41
  42         START_PROFILE(syscall_linux_setlease);
  43
  44 -#ifdef LINUX
  45 +#if defined(LINUX) && defined(HAVE_KERNEL_OPLOCKS_LINUX)
  46         /* first set the signal handler */
  47         if(linux_set_lease_sighandler(fd) == -1)
  48                 return -1;