add some guards for non Windows headers and reorder

alphabetically some autotools stuff

SVN revision: 59393

diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 7feceef3df11c70cd7c095c3e4f8d8523b216cd9..624e9b5985e53e09f7b3c8f0d7d66621c2f115fc 100644 (file)
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -418,7 +418,7 @@ fi
 
 ### Checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])
+AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h netinet/in.h])
 
 EFL_CHECK_PATH_MAX
 
@@ -1749,18 +1749,18 @@ echo "Image Loaders:"
 echo "  BMP.....................: $have_evas_image_loader_bmp"
 echo "  EDB.....................: $have_evas_image_loader_edb"
 echo "  EET.....................: $have_evas_image_loader_eet"
+echo "  GENERIC.................: $have_evas_image_loader_generic"
 echo "  GIF.....................: $have_evas_image_loader_gif"
 echo "  ICO.....................: $have_evas_image_loader_ico"
 echo "  JPEG....................: $have_evas_image_loader_jpeg (region: $have_jpeg_region)"
 echo "  PMAPS...................: $have_evas_image_loader_pmaps"
 echo "  PNG.....................: $have_evas_image_loader_png"
+echo "  PSD.....................: $have_evas_image_loader_psd"
 echo "  SVG.....................: $have_evas_image_loader_svg"
 echo "  TGA.....................: $have_evas_image_loader_tga"
 echo "  TIFF....................: $have_evas_image_loader_tiff"
 echo "  WBMP....................: $have_evas_image_loader_wbmp"
 echo "  XPM.....................: $have_evas_image_loader_xpm"
-echo "  PSD.....................: $have_evas_image_loader_psd"
-echo "  GENERIC.................: $have_evas_image_loader_generic"
 echo
 echo "Font Sourcing Systems:"
 echo "  EET.....................: $have_evas_font_loader_eet"

diff --git a/legacy/evas/src/modules/loaders/Makefile.am b/legacy/evas/src/modules/loaders/Makefile.am
index ddd51a59025651d0ba4287afab539da9503ce6fc..b7ed9a5324e800b5317254cec382deae9cf769f4 100644 (file)
--- a/legacy/evas/src/modules/loaders/Makefile.am
+++ b/legacy/evas/src/modules/loaders/Makefile.am
@@ -20,6 +20,12 @@ SUBDIRS += eet
 endif
 endif
 
+if BUILD_LOADER_GENERIC
+if !EVAS_STATIC_BUILD_GENERIC
+SUBDIRS += generic
+endif
+endif
+
 if BUILD_LOADER_GIF
 if !EVAS_STATIC_BUILD_GIF
 SUBDIRS += gif
@@ -50,6 +56,12 @@ SUBDIRS += png
 endif
 endif
 
+if BUILD_LOADER_PSD
+if !EVAS_STATIC_BUILD_PSD
+SUBDIRS += psd
+endif
+endif
+
 if BUILD_LOADER_SVG
 if !EVAS_STATIC_BUILD_SVG
 SUBDIRS += svg
@@ -79,16 +91,3 @@ if !EVAS_STATIC_BUILD_XPM
 SUBDIRS += xpm
 endif
 endif
-
-if BUILD_LOADER_PSD
-if !EVAS_STATIC_BUILD_PSD
-SUBDIRS += psd
-endif
-endif
-
-if BUILD_LOADER_GENERIC
-if !EVAS_STATIC_BUILD_GENERIC
-SUBDIRS += generic
-endif
-endif
-

diff --git a/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c b/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c
index f15f9385d90141328ccde90d61a714b96987ea2c..1c7d78081e6c98af6ae4f15fb27e84480b873798 100644 (file)
--- a/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c
+++ b/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c
@@ -10,13 +10,19 @@
 #include <errno.h>
 
 #include <math.h>
-#include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif