← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/imagemagick/oneiric-updates

« back to all changes in this revision

Viewing changes to utilities/display.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-06-15 11:05:28 UTC
  • mfrom: (6.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110615110528-08jgo07a4846xh8d
Tags: 8:6.6.0.4-3ubuntu1
https://launchpad.net/bugs/797595
* Resynchronise with Debian (LP: #797595).  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Make debian/rules install target depend on check; they cannot reliably
    be run in parallel.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/display.c
72
72
%
73
73
*/
74
74
 
75
 
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 
75
#if defined(__WINDOWS__)
76
76
int WINAPI WinMain(HINSTANCE instance,HINSTANCE last,LPSTR command,int state)
77
77
{
78
78
  char
82
82
    argc,
83
83
    main(int,char **);
84
84
 
85
 
  (void) instance;
86
 
  (void) last;
87
 
  (void) state;
88
85
  argv=StringToArgv(command,&argc);
89
86
  return(main(argc,argv));
90
87
}