1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
diff -Naurp dx-4.4.4-orig/src/uipp/base/Application.h dx-4.4.4/src/uipp/base/Application.h
--- dx-4.4.4-orig/src/uipp/base/Application.h 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/base/Application.h 2008-05-18 17:26:10.000000000 +0200
@@ -49,7 +49,7 @@ class Application : public UIComponent,
//
// The main program needs to access protected member functions.
//
- friend int main(unsigned int argc,
+ friend int main(int argc,
char** argv);
diff -Naurp dx-4.4.4-orig/src/uipp/dxui/Main.C dx-4.4.4/src/uipp/dxui/Main.C
--- dx-4.4.4-orig/src/uipp/dxui/Main.C 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/dxui/Main.C 2008-05-18 17:25:13.000000000 +0200
@@ -48,7 +48,7 @@ extern unsigned long _etext;
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
@@ -104,7 +104,7 @@ int main(unsigned int argc,
// add *tearOffModel:: XmTEAR_OFF_ENABLED/XmTEAR_OFF_DISABLED
XmRepTypeInstallTearOffModelConverter();
- if (!theApplication->initialize(&argc, argv))
+ if (!theApplication->initialize((unsigned int*)&argc, argv))
exit(1);
theApplication->handleEvents();
diff -Naurp dx-4.4.4-orig/src/uipp/mb/Main.C dx-4.4.4/src/uipp/mb/Main.C
--- dx-4.4.4-orig/src/uipp/mb/Main.C 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/mb/Main.C 2008-05-18 17:24:57.000000000 +0200
@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
@@ -39,7 +39,7 @@ int main(unsigned int argc,
theApplication = new MBApplication("MB");
}
- theApplication->initialize(&argc, argv);
+ theApplication->initialize((unsigned int*)&argc, argv);
theApplication->handleEvents();
delete theApplication;
diff -Naurp dx-4.4.4-orig/src/uipp/prompter/Main.C dx-4.4.4/src/uipp/prompter/Main.C
--- dx-4.4.4-orig/src/uipp/prompter/Main.C 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/prompter/Main.C 2008-05-18 17:25:53.000000000 +0200
@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
@@ -34,7 +34,7 @@ int main(unsigned int argc,
theApplication = new GARApplication("GAR");
}
- theApplication->initialize(&argc, argv);
+ theApplication->initialize((unsigned int*)&argc, argv);
theApplication->handleEvents();
delete theApplication;
diff -Naurp dx-4.4.4-orig/src/uipp/startup/Main.C dx-4.4.4/src/uipp/startup/Main.C
--- dx-4.4.4-orig/src/uipp/startup/Main.C 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/startup/Main.C 2008-05-18 17:25:38.000000000 +0200
@@ -14,7 +14,7 @@
extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
@@ -31,7 +31,7 @@ int main(unsigned int argc,
theApplication = new StartupApplication("Startup");
}
- theApplication->initialize(&argc, argv);
+ theApplication->initialize((unsigned int*)&argc, argv);
theApplication->handleEvents();
delete theApplication;
diff -Naurp dx-4.4.4-orig/src/uipp/tutor/Main.C dx-4.4.4/src/uipp/tutor/Main.C
--- dx-4.4.4-orig/src/uipp/tutor/Main.C 2008-05-18 17:09:32.000000000 +0200
+++ dx-4.4.4/src/uipp/tutor/Main.C 2008-05-18 17:25:27.000000000 +0200
@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
@@ -58,7 +58,7 @@ int main(unsigned int argc,
theApplication = new TutorApplication("DXTutor");
}
- if (!theApplication->initialize(&argc, argv))
+ if (!theApplication->initialize((unsigned int*)&argc, argv))
exit(1);
theApplication->handleEvents();
|
GitWeb