ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/mon/src/main.cpp
(Generate patch)

Comparing mon/src/main.cpp (file contents):
Revision 1.2 by cebix, 1999-10-04T21:16:02Z vs.
Revision 1.11 by cebix, 2010-02-21T11:58:33Z

# Line 1 | Line 1
1   /*
2 < *  main.cpp - Wrapper program for standalone mon
2 > *  main.cpp - Wrapper program for standalone cxmon
3   *
4 < *  mon (C) 1997-1999 Christian Bauer, Marc Hellwig
4 > *  cxmon (C) Christian Bauer, Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 23 | Line 23
23   #include "mon.h"
24  
25  
26 < #if __BEOS__
26 > #ifdef __BEOS__
27   #include <AppKit.h>
28   #include <KernelKit.h>
29   #include <StorageKit.h>
30 + #include <stdlib.h>
31  
32   // Detect if program was launched from Shell or Tracker
33   static bool launched_from_tracker(void)
34   {
35 <        char *cmd = getenv("_");
35 >        const char *cmd = getenv("_");
36          if (cmd == NULL || strlen(cmd) < 7)
37                  return false;
38          return !strcmp(cmd + strlen(cmd) - 7 , "Tracker");
# Line 62 | Line 63 | static bool open_stdio(const char *title
63          strcat(term_path, "/Terminal");
64  
65          // Load "Terminal"
66 <        char *t_argv[6];
66 >        const char *t_argv[6];
67          t_argv[0] = term_path;
68          t_argv[1] = "-t";
69          t_argv[2] = (char *)title;
70          t_argv[3] = "/bin/debug_glue";
71          t_argv[4] = key_name;
72          t_argv[5] = sem_id_str;
73 <        thread_id th = load_image(6, t_argv, environ);
73 >        thread_id th = load_image(6, t_argv, (const char **)environ);
74          if (th < 0) {
75                  delete_sem(glue_sem);
76                  return false;
# Line 99 | Line 100 | static bool open_stdio(const char *title
100   #endif
101  
102   // Main program
103 < int main(int argc, char **argv)
103 > int main(int argc, const char **argv)
104   {
105 < #if __BEOS__
105 > #ifdef __BEOS__
106          // Launched from Tracker? Then open terminal window
107          if (launched_from_tracker()) {
108                  if (!open_stdio("mon"))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines