mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Fix build with clang 3.4 amd64 current r265844.

Browse Source 
Submitted by:	Roman Cat <roman-cat@yandex.ru>
This commit is contained in:
Stephen Montgomery-Smith 2014-05-13 02:00:33 +00:00
parent 60b7abaa65
commit b132422915
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=353911
1 changed files with 285 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
graphics/opendx/files/patch-src Normal file
View File

@ -0,0 +1,285 @@
diff -aru src.orig/uipp/base/Application.C src/uipp/base/Application.C
--- src.orig/uipp/base/Application.C 2005-11-09 21:56:17.000000000 +0300
+++ src/uipp/base/Application.C 2014-05-12 09:46:06.000000000 +0400
@@ -136,7 +136,7 @@
//this->setDefaultResources(baseWidget, Application::DefaultResources);
}
-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean Application::initializeWindowSystem(int *argcp, char **argv)
{
//
@@ -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];
@@ -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.
diff -aru src.orig/uipp/base/Application.h src/uipp/base/Application.h
--- src.orig/uipp/base/Application.h 2005-11-09 21:26:29.000000000 +0300
+++ src/uipp/base/Application.h 2014-05-12 09:46:33.000000000 +0400
@@ -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
diff -aru src.orig/uipp/base/IBMApplication.C src/uipp/base/IBMApplication.C
--- src.orig/uipp/base/IBMApplication.C 2004-04-03 00:32:43.000000000 +0400
+++ src/uipp/base/IBMApplication.C 2014-05-12 09:46:49.000000000 +0400
@@ -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))
diff -aru src.orig/uipp/base/IBMApplication.h src/uipp/base/IBMApplication.h
--- src.orig/uipp/base/IBMApplication.h 2003-09-20 09:35:22.000000000 +0400
+++ src/uipp/base/IBMApplication.h 2014-05-12 09:47:07.000000000 +0400
@@ -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
diff -aru src.orig/uipp/dxui/Main.C src/uipp/dxui/Main.C
--- src.orig/uipp/dxui/Main.C 2005-12-07 20:50:53.000000000 +0300
+++ src/uipp/dxui/Main.C 2014-05-12 09:44:51.000000000 +0400
@@ -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)
diff -aru src.orig/uipp/dxuilib/DXApplication.C src/uipp/dxuilib/DXApplication.C
--- src.orig/uipp/dxuilib/DXApplication.C 2006-06-22 23:45:34.000000000 +0400
+++ src/uipp/dxuilib/DXApplication.C 2014-05-12 09:47:15.000000000 +0400
@@ -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;
diff -aru src.orig/uipp/dxuilib/DXApplication.h src/uipp/dxuilib/DXApplication.h
--- src.orig/uipp/dxuilib/DXApplication.h 2006-05-08 20:20:10.000000000 +0400
+++ src/uipp/dxuilib/DXApplication.h 2014-05-12 09:47:31.000000000 +0400
@@ -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);
//
diff -aru src.orig/uipp/mb/MBApplication.C src/uipp/mb/MBApplication.C
--- src.orig/uipp/mb/MBApplication.C 2006-05-08 20:20:13.000000000 +0400
+++ src/uipp/mb/MBApplication.C 2014-05-12 09:47:39.000000000 +0400
@@ -117,7 +117,7 @@
#endif
}
-boolean MBApplication::initialize(unsigned int* argcp,
+boolean MBApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -aru src.orig/uipp/mb/MBApplication.h src/uipp/mb/MBApplication.h
--- src.orig/uipp/mb/MBApplication.h 1999-05-10 19:46:25.000000000 +0400
+++ src/uipp/mb/MBApplication.h 2014-05-12 09:47:56.000000000 +0400
@@ -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;
diff -aru src.orig/uipp/mb/Main.C src/uipp/mb/Main.C
--- src.orig/uipp/mb/Main.C 2000-05-20 21:49:40.000000000 +0400
+++ src/uipp/mb/Main.C 2014-05-12 09:44:59.000000000 +0400
@@ -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)
diff -aru src.orig/uipp/prompter/GARApplication.C src/uipp/prompter/GARApplication.C
--- src.orig/uipp/prompter/GARApplication.C 2006-05-08 20:20:13.000000000 +0400
+++ src/uipp/prompter/GARApplication.C 2014-05-12 09:48:05.000000000 +0400
@@ -198,7 +198,7 @@
}
}
-boolean GARApplication::initialize(unsigned int* argcp,
+boolean GARApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -aru src.orig/uipp/prompter/GARApplication.h src/uipp/prompter/GARApplication.h
--- src.orig/uipp/prompter/GARApplication.h 2003-09-20 09:33:21.000000000 +0400
+++ src/uipp/prompter/GARApplication.h 2014-05-12 09:48:24.000000000 +0400
@@ -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
diff -aru src.orig/uipp/prompter/Main.C src/uipp/prompter/Main.C
--- src.orig/uipp/prompter/Main.C 2000-05-16 22:52:59.000000000 +0400
+++ src/uipp/prompter/Main.C 2014-05-12 09:45:07.000000000 +0400
@@ -17,7 +17,7 @@
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -aru src.orig/uipp/startup/Main.C src/uipp/startup/Main.C
--- src.orig/uipp/startup/Main.C 2000-05-16 22:53:07.000000000 +0400
+++ src/uipp/startup/Main.C 2014-05-12 09:45:13.000000000 +0400
@@ -14,7 +14,7 @@
extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -aru src.orig/uipp/startup/StartupApplication.C src/uipp/startup/StartupApplication.C
--- src.orig/uipp/startup/StartupApplication.C 2005-11-10 22:48:22.000000000 +0300
+++ src/uipp/startup/StartupApplication.C 2014-05-12 09:48:31.000000000 +0400
@@ -117,7 +117,7 @@
#endif
}
-boolean StartupApplication::initialize(unsigned int* argcp,
+boolean StartupApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -aru src.orig/uipp/startup/StartupApplication.h src/uipp/startup/StartupApplication.h
--- src.orig/uipp/startup/StartupApplication.h 2003-09-20 09:33:56.000000000 +0400
+++ src/uipp/startup/StartupApplication.h 2014-05-12 09:48:50.000000000 +0400
@@ -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
diff -aru src.orig/uipp/tutor/Main.C src/uipp/tutor/Main.C
--- src.orig/uipp/tutor/Main.C 2000-05-16 22:53:15.000000000 +0400
+++ src/uipp/tutor/Main.C 2014-05-12 09:45:22.000000000 +0400
@@ -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)
diff -aru src.orig/uipp/tutor/TutorApplication.C src/uipp/tutor/TutorApplication.C
--- src.orig/uipp/tutor/TutorApplication.C 2006-05-08 20:20:14.000000000 +0400
+++ src/uipp/tutor/TutorApplication.C 2014-05-12 09:48:59.000000000 +0400
@@ -196,7 +196,7 @@
#endif
}
-boolean TutorApplication::initialize(unsigned int* argcp,
+boolean TutorApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -aru src.orig/uipp/tutor/TutorApplication.h src/uipp/tutor/TutorApplication.h
--- src.orig/uipp/tutor/TutorApplication.h 1999-05-10 19:46:30.000000000 +0400
+++ src/uipp/tutor/TutorApplication.h 2014-05-12 09:49:16.000000000 +0400
@@ -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);
//