--- src/exec/libdx/lock.c.orig	2003-07-12 00:12:11 UTC
+++ src/exec/libdx/lock.c
@@ -936,7 +936,7 @@ DXunlock(lock_type *l, int who)
     if (_lock->knt == 0)
     {
         DXSetError(ERROR_INTERNAL, "Unlocking an unlocked lock?");
-	return;
+	return ERROR;
     }
 
     /*
--- src/uipp/base/Application.C.orig	2005-11-09 18:56:17 UTC
+++ src/uipp/base/Application.C
@@ -136,7 +136,7 @@ void Application::installDefaultResource
     //this->setDefaultResources(baseWidget, Application::DefaultResources);
 }
 
-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) 
+boolean Application::initializeWindowSystem(int *argcp, char **argv) 
 {
 
     //
@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
     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];
@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned 
     //
 }
 
-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.orig	2005-11-09 18:26:29 UTC
+++ src/uipp/base/Application.h
@@ -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);
 
 
@@ -71,9 +71,9 @@ class Application : public UIComponent, 
     //
     // 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 @@ class Application : public UIComponent, 
     // 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.orig	2004-04-02 20:32:43 UTC
+++ src/uipp/base/IBMApplication.C
@@ -349,7 +349,7 @@ int status;
 }
 
 
-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 @@ boolean IBMApplication::initializeWindow
     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.orig	2003-09-20 05:35:22 UTC
+++ src/uipp/base/IBMApplication.h
@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
     //
     // 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 @@ class IBMApplication : public Applicatio
 
     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.orig	2005-12-07 17:50:53 UTC
+++ src/uipp/dxui/Main.C
@@ -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)
--- src/uipp/dxuilib/DXApplication.C.orig	2006-06-22 19:45:34 UTC
+++ src/uipp/dxuilib/DXApplication.C
@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
     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.orig	2006-05-08 16:20:10 UTC
+++ src/uipp/dxuilib/DXApplication.h
@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
     // 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.orig	2006-05-08 16:20:13 UTC
+++ src/uipp/mb/MBApplication.C
@@ -117,7 +117,7 @@ InitializeSignals(void)
 #endif       
 }            
 
-boolean MBApplication::initialize(unsigned int* argcp,
+boolean MBApplication::initialize(int* argcp,
 			       char**        argv)
 {
     ASSERT(argcp);
--- src/uipp/mb/MBApplication.h.orig	1999-05-10 15:46:25 UTC
+++ src/uipp/mb/MBApplication.h
@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
     // 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.orig	2000-05-20 17:49:40 UTC
+++ src/uipp/mb/Main.C
@@ -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)
--- src/uipp/prompter/GARApplication.C.orig	2006-05-08 16:20:13 UTC
+++ src/uipp/prompter/GARApplication.C
@@ -198,7 +198,7 @@ InitializeSignals(void)
     }
 }            
 
-boolean GARApplication::initialize(unsigned int* argcp,
+boolean GARApplication::initialize(int* argcp,
 			       char**        argv)
 {
     ASSERT(argcp);
--- src/uipp/prompter/GARApplication.h.orig	2003-09-20 05:33:21 UTC
+++ src/uipp/prompter/GARApplication.h
@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
     // 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.orig	2000-05-16 18:52:59 UTC
+++ src/uipp/prompter/Main.C
@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
 #endif
 
 
-int main(unsigned int argc,
+int main(int argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)
--- src/uipp/startup/Main.C.orig	2000-05-16 18:53:07 UTC
+++ 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/startup/StartupApplication.C.orig	2005-11-10 19:48:22 UTC
+++ src/uipp/startup/StartupApplication.C
@@ -117,7 +117,7 @@ InitializeSignals(void)
 #endif       
 }            
 
-boolean StartupApplication::initialize(unsigned int* argcp,
+boolean StartupApplication::initialize(int* argcp,
 			       char**        argv)
 {
     ASSERT(argcp);
--- src/uipp/startup/StartupApplication.h.orig	2003-09-20 05:33:56 UTC
+++ src/uipp/startup/StartupApplication.h
@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
     // 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
 
--- src/uipp/tutor/Main.C.orig	2000-05-16 18:53:15 UTC
+++ src/uipp/tutor/Main.C
@@ -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)
--- src/uipp/tutor/TutorApplication.C.orig	2006-05-08 16:20:14 UTC
+++ src/uipp/tutor/TutorApplication.C
@@ -196,7 +196,7 @@ InitializeSignals(void)
 #endif       
 }            
 
-boolean TutorApplication::initialize(unsigned int* argcp,
+boolean TutorApplication::initialize(int* argcp,
 			       char**        argv)
 {
     ASSERT(argcp);
--- src/uipp/tutor/TutorApplication.h.orig	1999-05-10 15:46:30 UTC
+++ src/uipp/tutor/TutorApplication.h
@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
     // 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);
 
     //