Mercurial > hg > Members > kono > Cerium

comparison TaskManager/kernel/main.cc @ 273:3e9c0039e15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:12:47 +0900
parents f872cc000fe0
children 181f693be3d5
comparison
equal deleted inserted replaced
272:f3b406eecf1c 273:3e9c0039e15c
1 #include <stdlib.h> 1 #include <stdlib.h>
2 //#include <string.h> 2 #include <string.h>
3 #include <string>
4 #include <SDL.h> 3 #include <SDL.h>
5 #include "TaskManager.h" 4 #include "TaskManager.h"
6 5
7 /* User main function */ 6 /* User main function */
8 extern int TMmain(int argc, char *argv[]); 7 extern int TMmain(int argc, char *argv[]);
10 /* Default TMend function */ 9 /* Default TMend function */
11 static void 10 static void
12 defaultTMend(void) {} 11 defaultTMend(void) {}
13 12
14 TaskManager *manager; 13 TaskManager *manager;
15 <<<<<<< local
16 <<<<<<< local
17 static std::string help_str = "\n\
18 =======
19 static char help_str[] = "\n\
20 >>>>>>> other
21 =======
22 const char *help_str = "\n\ 14 const char *help_str = "\n\
23 >>>>>>> other
24 * Cerium program option *\n\ 15 * Cerium program option *\n\
25 -help Print this message \n\ 16 -help Print this message \n\
26 -cpu Number of CPU (default 1) \n"; 17 -cpu Number of CPU (default 1) \n";
27 18
28 extern const char *usr_help_str; 19 extern const char *usr_help_str;