patches/patch-mwindow_C

   1 $NetBSD$
   2
   3 --- cinelerra/mwindow.C.orig    2010-02-01 09:14:29.000000000 +0000
   4 +++ cinelerra/mwindow.C
   5 @@ -19,6 +19,8 @@
   6   *
   7   */
   8
   9 +#include "config.h"
  10 +
  11  #include "asset.h"
  12  #include "assets.h"
  13  #include "awindowgui.h"
  14 @@ -1248,11 +1250,11 @@ void MWindow::test_plugins(EDL *new_edl,
  15         }
  16  }
  17
  18 -
  19 +#if defined(PROC_SHMMAX_PATH)
  20  void MWindow::init_shm()
  21  {
  22  // Fix shared memory
  23 -       FILE *fd = fopen("/proc/sys/kernel/shmmax", "w");
  24 +       FILE *fd = fopen(PROC_SHMMAX_PATH, "w");
  25         if(fd)
  26         {
  27                 fprintf(fd, "0x7fffffff");
  28 @@ -1260,10 +1262,10 @@ void MWindow::init_shm()
  29         }
  30         fd = 0;
  31
  32 -       fd = fopen("/proc/sys/kernel/shmmax", "r");
  33 +       fd = fopen(PROC_SHMMAX_PATH, "r");
  34         if(!fd)
  35         {
  36 -               MainError::show_error("MWindow::init_shm: couldn't open /proc/sys/kernel/shmmax for reading.\n");
  37 +               MainError::show_error("MWindow::init_shm: couldn't open " PROC_SHMMAX_PATH " for reading.\n");
  38                 return;
  39         }
  40
  41 @@ -1273,13 +1275,17 @@ void MWindow::init_shm()
  42         fd = 0;
  43         if(result < 0x7fffffff)
  44         {
  45 -               eprintf("WARNING: /proc/sys/kernel/shmmax is 0x%llx, which is too low.\n"
  46 +               eprintf("WARNING: " PROC_SHMMAX_PATH " is 0x%llx, which is too low.\n"
  47                         "Before running Cinelerra do the following as root:\n"
  48 -                       "echo \"0x7fffffff\" > /proc/sys/kernel/shmmax\n",
  49 +                       "echo \"0x7fffffff\" > " PROC_SHMMAX_PATH "\n",
  50                         result);
  51         }
  52  }
  53 -
  54 +#else
  55 +void MWindow::init_shm() {
  56 +    /* We can't do anything. */
  57 +}
  58 +#endif
  59
  60
  61  void MWindow::create_objects(int want_gui,