30 lines
898 B
Diff
30 lines
898 B
Diff
|
--- digikam/libs/dcraw/Makefile.am
|
||
|
|
+++ digikam/libs/dcraw/Makefile.am
|
||
|
|
@@ -25,14 +25,6 @@
|
||
|
|
|
||
|
|
bin_PROGRAMS = digikamdcraw
|
||
|
|
|
||
|
|
-# This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
|
||
|
|
-# In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C
|
||
|
|
-# implementation. The -Dinline option please compiler to see inline with this option.
|
||
|
|
-# Note : using -std-c99 instead -std=iso9899:1990 is not possible because some compiler
|
||
|
|
-# do not support it.
|
||
|
|
-# Thanks to Andras Mantia for this tip.
|
||
|
|
-digikamdcraw_CFLAGS = -Dinline= -w
|
||
|
|
-
|
||
|
|
digikamdcraw_SOURCES = dcraw.c
|
||
|
|
|
||
|
|
digikamdcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) $(LCMS_LIBS)
|
||
|
|
--- digikam/libs/dcraw/dcraw.c
|
||
|
|
+++ digikam/libs/dcraw/dcraw.c
|
||
|
|
@@ -46,7 +46,9 @@
|
||
|
|
#include <jpeglib.h>
|
||
|
|
#endif
|
||
|
|
#ifndef NO_LCMS
|
||
|
|
+#define inline __inline__
|
||
|
|
#include <lcms.h>
|
||
|
|
+#undef inline
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef __CYGWIN__
|