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.1 by cebix, 1999-10-04T19:31:09Z vs.
Revision 1.8 by cebix, 2002-01-18T16:03:33Z

# Line 1 | Line 1
1   /*
2 < *  main.cpp - "mon" main program
2 > *  main.cpp - Wrapper program for standalone cxmon
3   *
4 < *  (C) 1997-1999 Christian Bauer
4 > *  cxmon (C) 1997-2002 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
8 > *  the Free Software Foundation; either version 2 of the License, or
9 > *  (at your option) any later version.
10 > *
11 > *  This program is distributed in the hope that it will be useful,
12 > *  but WITHOUT ANY WARRANTY; without even the implied warranty of
13 > *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 > *  GNU General Public License for more details.
15 > *
16 > *  You should have received a copy of the GNU General Public License
17 > *  along with this program; if not, write to the Free Software
18 > *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19   */
20  
21 < #include <stdlib.h>
8 < #include <stdio.h>
9 < #include <string.h>
10 < #include <unistd.h>
21 > #include "sysdeps.h"
22  
23   #include "mon.h"
24  
25 < #if __BEOS__
25 >
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)
# Line 50 | 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 89 | Line 102 | static bool open_stdio(const char *title
102   // Main program
103   int main(int argc, 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