net/samba3/patches/110-compile_fixes.patch

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