summaryrefslogtreecommitdiff
path: root/numlib/ui.c
diff options
context:
space:
mode:
Diffstat (limited to 'numlib/ui.c')
-rw-r--r--numlib/ui.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/numlib/ui.c b/numlib/ui.c
index a3cdbe8..31fd3b6 100644
--- a/numlib/ui.c
+++ b/numlib/ui.c
@@ -12,8 +12,7 @@
* see the License.txt file for licencing details.
*
* Typically we need to set things up and then call the
- * "normal" main, called "uimain" in ArgyllCMS utils,
- * created by ui.h #defining main to uimain.
+ * "normal" main, called "uimain" in ArgyllCMS utils.
*/
#ifdef UNIX
@@ -49,14 +48,6 @@
# include <Foundation/Foundation.h>
# include <AppKit/AppKit.h>
-/* (Duplicate declaration from numsup.h) */
-
-/* Tell App Nap that this is user initiated */
-void osx_userinitiated_start();
-
-/* Done with user initiated */
-void osx_userinitiated_end();
-
/* This is a mechanism to force libui to link */
int ui_initialized = 0;
@@ -66,9 +57,6 @@ static char **g_argv;
pthread_t ui_thid = 0; /* Thread ID of main thread running io run loop */
pthread_t ui_main_thid = 0; /* Thread ID of thread running application main() */
-extern int uimain(int argc, char *argv[]);
-
-/* Thread that calls the real application main() */
static void *callMain(void *p) {
int rv;
@@ -76,13 +64,8 @@ static void *callMain(void *p) {
NSAutoreleasePool *tpool = [NSAutoreleasePool new];
- /* Turn App Nap off */
- osx_userinitiated_start();
-
rv = uimain(g_argc, g_argv);
- osx_userinitiated_end();
-
[tpool release];
exit(rv);
@@ -221,8 +204,6 @@ int ui_initialized = 0;
//# pragma comment( linker, "/subsystem:windows /ENTRY:mainCRTStartup" )
//# pragma comment( linker, "/subsystem:windows /ENTRY:WinMainCRTStartup" )
-extern int uimain(int argc, char *argv[]);
-
APIENTRY WinMain(
HINSTANCE hInstance,
HINSTANCE hPrevInstance,