Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/imagemagick/patches/la.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 28 Mar 2013 08:23:25 -0700
changeset 1233 4817abd9e86b
parent 168 5884bc1edfdf
child 1255 b7b09f9348b7
permissions -rw-r--r--
16425619 Request to update pep8 to the latest version in s12 16425549 pep8 needs a man page.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
168
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     1
 
*** ImageMagick-6.3.4/magick/module.c.orig	Thu Apr 12 20:00:07 2007
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     2
 
--- ImageMagick-6.3.4/magick/module.c	Thu Apr 12 20:00:45 2007
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     3
 
***************
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     4
 
*** 71,77 ****
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     5
 
    Define declarations.
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     6
 
  */
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     7
 
  #if defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     8
 
! #  define ModuleGlobExpression "*.la"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     9
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    10
 
  #  if defined(_DEBUG)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    11
 
  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    12
 
--- 71,77 ----
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    13
 
    Define declarations.
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    14
 
  */
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    15
 
  #if defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    16
 
! #  define ModuleGlobExpression "*.so"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    17
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    18
 
  #  if defined(_DEBUG)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    19
 
  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    20
 
***************
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    21
 
*** 1271,1277 ****
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    22
 
    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    23
 
    assert(name != (char *) NULL);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    24
 
  #if defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    25
 
!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    26
 
    (void) LocaleLower(name);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    27
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    28
 
  #if defined(__WINDOWS__)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    29
 
--- 1271,1277 ----
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    30
 
    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    31
 
    assert(name != (char *) NULL);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    32
 
  #if defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    33
 
!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    34
 
    (void) LocaleLower(name);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    35
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    36
 
  #if defined(__WINDOWS__)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    37
 
***************
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    38
 
*** 1322,1328 ****
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    39
 
  #if !defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    40
 
    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    41
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    42
 
!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    43
 
    (void) LocaleLower(name);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    44
 
  #endif
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    45
 
  }
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    46
 
--- 1322,1328 ----
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    47
 
  #if !defined(HasLTDL)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    48
 
    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    49
 
  #else
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    50
 
!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    51
 
    (void) LocaleLower(name);
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    52
 
  #endif
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    53
 
  }
upstream/oracle/userland-gate