diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-08-24 01:08:57 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-08-24 01:08:57 +0000 |
| commit | bdbbf7888afea7053d7c8dbce16805730566366e (patch) | |
| tree | d487b0b1f1f4fb6b3c2df115a773b00dd21c73d6 | |
| parent | 3d695cd4be100477a16cab657e41ee9416619fe7 (diff) | |
| download | netpbm-mirror-bdbbf7888afea7053d7c8dbce16805730566366e.tar.gz netpbm-mirror-bdbbf7888afea7053d7c8dbce16805730566366e.tar.xz netpbm-mirror-bdbbf7888afea7053d7c8dbce16805730566366e.zip | |
Change __inline to __inline__
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2254 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | lib/ppm.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index d5e461fc..3fdb683d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -26,6 +26,11 @@ not yet BJH Release 10.68.00 attempted only on a system with libvga). Introduced in Netpbm 10.63 (June 2013) + Build: fix build failure in an environment that does not have + __inline . Introduced some time between Netpbm 10.26 + (January 2005) and Netpbm 10.35 (August 2006). + + 14.06.29 BJH Release 10.67.00 sgitopnm: add ability to convert 2-channel SGI image. diff --git a/lib/ppm.h b/lib/ppm.h index 76179724..7a24f926 100644 --- a/lib/ppm.h +++ b/lib/ppm.h @@ -250,13 +250,13 @@ struct hsv ppm_hsv_from_color(pixel const color, pixval const maxval); -static __inline pixval +static __inline__ pixval ppm_luminosity(pixel const p) { return (pixval)(PPM_LUMIN(p) + 0.5); } -static __inline pixval +static __inline__ pixval ppm_colorvalue(pixel const p) { /*---------------------------------------------------------------------------- The color value (V is HSV) as a pixval @@ -264,7 +264,7 @@ ppm_colorvalue(pixel const p) { return PPM_MAX(PPM_GETR(p), PPM_MAX(PPM_GETG(p), PPM_GETB(p))); } -static __inline pixval +static __inline__ pixval ppm_saturation(pixel const p, pixval const maxval) { /*---------------------------------------------------------------------------- |