File dx-4.4.4-gcc_43.patch of Package dx
--- src/uipp/base/Application.C
+++ src/uipp/base/Application.C
@@ -136,7 +136,7 @@
//this->setDefaultResources(baseWidget, Application::DefaultResources);
}
-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean Application::initializeWindowSystem(int *argcp, char **argv)
{
//
@@ -149,9 +149,9 @@
NULL, // command line options table
0, // number of entries in options table
#if XtSpecificationRelease > 4
- (int*)argcp,
-#else
argcp,
+#else
+ (unsigned int *)argcp,
#endif
argv, // "argv" command line arguments
#if XtSpecificationRelease > 4
@@ -235,7 +235,7 @@
return TRUE;
}
-void Application::parseCommand(unsigned int* argcp, char** argv,
+void Application::parseCommand(int* argcp, char** argv,
XrmOptionDescList optlist, int optlistsize)
{
char res_file[256];
@@ -251,7 +251,7 @@
//
char *appname = GetFileBaseName(argv[0],NULL);
XrmParseCommand(&resourceDatabase, optlist, optlistsize,
- appname, (int *)argcp, argv);
+ appname, argcp, argv);
delete[] appname;
//
@@ -280,7 +280,7 @@
//
}
-boolean Application::initialize(unsigned int* argcp, char** argv)
+boolean Application::initialize(int* argcp, char** argv)
{
//
// Initialize the window system if not done already.
--- src/uipp/base/Application.h
+++ src/uipp/base/Application.h
@@ -49,7 +49,7 @@
//
// The main program needs to access protected member functions.
//
- friend int main(unsigned int argc,
+ friend int main(int argc,
char** argv);
@@ -71,9 +71,9 @@
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
- virtual void parseCommand(unsigned int* argcp, char** argv,
+ virtual void parseCommand(int* argcp, char** argv,
XrmOptionDescList optlist, int optlistsize);
//
@@ -145,7 +145,7 @@
// Initializes any Application specfic state. This routine should
// be called by main() or subclasses only.
//
- virtual boolean initialize(unsigned int* argcp, char** argv);
+ virtual boolean initialize(int* argcp, char** argv);
//
// Allow others to access our event processing mechanism
--- src/uipp/base/IBMApplication.C
+++ src/uipp/base/IBMApplication.C
@@ -349,7 +349,7 @@
}
-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
{
if (!this->Application::initializeWindowSystem(argcp, argv))
@@ -375,7 +375,7 @@
return TRUE;
}
-boolean IBMApplication::initialize(unsigned int* argcp,
+boolean IBMApplication::initialize(int* argcp,
char** argv)
{
if (!this->Application::initialize(argcp,argv))
--- src/uipp/base/IBMApplication.h
+++ src/uipp/base/IBMApplication.h
@@ -77,7 +77,7 @@
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
//
// Protected member data:
@@ -88,7 +88,7 @@
HelpWin *helpWindow;
- boolean initialize(unsigned int* argcp, char** argv);
+ boolean initialize(int* argcp, char** argv);
//
// Load application specific action routines
--- src/uipp/dxui/Main.C
+++ src/uipp/dxui/Main.C
@@ -48,7 +48,7 @@
//
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)
--- src/uipp/dxuilib/DXApplication.C
+++ src/uipp/dxuilib/DXApplication.C
@@ -2248,7 +2248,7 @@
this->setDefaultResources(baseWidget, _defaultDXResources);
this->IBMApplication::installDefaultResources(baseWidget);
}
-boolean DXApplication::initialize(unsigned int* argcp,
+boolean DXApplication::initialize(int* argcp,
char** argv)
{
boolean wasSetBusy = FALSE;
--- src/uipp/dxuilib/DXApplication.h
+++ src/uipp/dxuilib/DXApplication.h
@@ -372,7 +372,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
--- src/uipp/mb/MBApplication.C
+++ src/uipp/mb/MBApplication.C
@@ -117,7 +117,7 @@
#endif
}
-boolean MBApplication::initialize(unsigned int* argcp,
+boolean MBApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/mb/MBApplication.h
+++ src/uipp/mb/MBApplication.h
@@ -51,7 +51,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
static MBResource resource;
--- src/uipp/mb/Main.C
+++ src/uipp/mb/Main.C
@@ -22,7 +22,7 @@
//
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)
--- src/uipp/prompter/GARApplication.C
+++ src/uipp/prompter/GARApplication.C
@@ -198,7 +198,7 @@
}
}
-boolean GARApplication::initialize(unsigned int* argcp,
+boolean GARApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/prompter/GARApplication.h
+++ src/uipp/prompter/GARApplication.h
@@ -129,7 +129,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
CommandScope *commandScope; // command scope
--- src/uipp/prompter/Main.C
+++ src/uipp/prompter/Main.C
@@ -17,7 +17,7 @@
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/startup/Main.C
+++ src/uipp/startup/Main.C
@@ -14,7 +14,7 @@
extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/tutor/Main.C
+++ src/uipp/tutor/Main.C
@@ -31,7 +31,7 @@
//
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)
--- src/uipp/tutor/TutorApplication.C
+++ src/uipp/tutor/TutorApplication.C
@@ -196,7 +196,7 @@
#endif
}
-boolean TutorApplication::initialize(unsigned int* argcp,
+boolean TutorApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/tutor/TutorApplication.h
+++ src/uipp/tutor/TutorApplication.h
@@ -69,7 +69,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
--- src/uipp/startup/StartupApplication.C
+++ src/uipp/startup/StartupApplication.C
@@ -117,7 +117,7 @@
#endif
}
-boolean StartupApplication::initialize(unsigned int* argcp,
+boolean StartupApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/startup/StartupApplication.h
+++ src/uipp/startup/StartupApplication.h
@@ -84,7 +84,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp, char**argv);
+ virtual boolean initialize(int* argcp, char**argv);
CommandScope *commandScope; // command scope