Add <unistd.h> to files which use usleep()

The usleep() function is defined to be provided by unistd.h.
On Linux this is pulled in indirectly so the missing includes
don't cause build problems, but on Mingw32 the explicit include
of unistd.h is required. Since sleep() is not available on
Mingw32, #define it to usleep(). Remove some _POSIX_C_SOURCE
macros which restricted code to 1993 POSIX standard which
blocks use of usleep().



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14997 67ed7778-7388-44ab-90cf-0a291f65f57c

31 files changed, 31 insertions, 5 deletions

diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
index 2ee40f7e9..388c7d33a 100644
--- a/camlibs/barbie/barbie.c
+++ b/camlibs/barbie/barbie.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <bayer.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 
 #ifdef ENABLE_NLS
diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c
index 0d625f2d7..65bffce23 100644
--- a/camlibs/casio/casio-qv.c
+++ b/camlibs/casio/casio-qv.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "casio-qv-commands.h"
 #include "camtojpeg.h"
diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
index 627ef2a4f..b641c8b9d 100644
--- a/camlibs/enigma13/enigma13.c
+++ b/camlibs/enigma13/enigma13.c
@@ -19,8 +19,6 @@
  *
  */
 
-#define _POSIX_C_SOURCE 199309L
-
 #include "config.h"
 
 #include <stdio.h>
diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c
index 309c2c4d0..c672cac5b 100644
--- a/camlibs/gsmart300/gsmart300.c
+++ b/camlibs/gsmart300/gsmart300.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 #include "gphoto2-endian.h"
 
diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c
index d7f04720f..6eae7224f 100644
--- a/camlibs/kodak/dc120/dc120.c
+++ b/camlibs/kodak/dc120/dc120.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c
index 69506bf2c..e3b92b733 100644
--- a/camlibs/kodak/dc120/library.c
+++ b/camlibs/kodak/dc120/library.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 
 #include "dc120.h"
diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c
index af52a6531..0a0763f43 100644
--- a/camlibs/kodak/dc210/library.c
+++ b/camlibs/kodak/dc210/library.c
@@ -1,9 +1,9 @@
-#define _POSIX_C_SOURCE 199309L
 #include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 
 #include "dc210.h"
diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c
index a4d58f9c1..54d3b9db5 100644
--- a/camlibs/kodak/dc240/library.c
+++ b/camlibs/kodak/dc240/library.c
@@ -4,13 +4,12 @@
        Hubert Figuiere <hfiguiere@teaser.fr>
  */
 
-#define _POSIX_C_SOURCE 199309L
-
 #include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c
index fc81521db..f87eac8f3 100644
--- a/camlibs/kodak/dc3200/dc3200.c
+++ b/camlibs/kodak/dc3200/dc3200.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 
diff --git a/camlibs/konica/qm150.c b/camlibs/konica/qm150.c
index b65fa1ca5..2e5656cf8 100644
--- a/camlibs/konica/qm150.c
+++ b/camlibs/konica/qm150.c
@@ -43,6 +43,7 @@
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <exif.h>
+#include <unistd.h>
 
 #ifdef ENABLE_NLS
 #  include <libintl.h>
diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c
index 74f9888ee..20fad6d91 100644
--- a/camlibs/largan/lmini/lmini.c
+++ b/camlibs/largan/lmini/lmini.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/mustek/io.c b/camlibs/mustek/io.c
index 55ad4b9bc..dbff9dfd4 100644
--- a/camlibs/mustek/io.c
+++ b/camlibs/mustek/io.c
@@ -35,6 +35,7 @@
 #include "io.h"
 #include <string.h>
 #include <sys/time.h>
+#include <unistd.h>
 #include "print.h"
 #include "rs232.h"
 #include "usb.h"
diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c
index a4ce4866a..5fedcf2ba 100644
--- a/camlibs/mustek/rs232.c
+++ b/camlibs/mustek/rs232.c
@@ -31,6 +31,7 @@
 
 #include <fcntl.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 
 /*
diff --git a/camlibs/mustek/usb.c b/camlibs/mustek/usb.c
index ab7d95411..59a4f3459 100644
--- a/camlibs/mustek/usb.c
+++ b/camlibs/mustek/usb.c
@@ -38,6 +38,7 @@
 
 #include <fcntl.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 
 /*
diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c
index 6dae6b44d..eae53037a 100644
--- a/camlibs/pentax/library.c
+++ b/camlibs/pentax/library.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <stdbool.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c
index 062a2bde5..524e2e1ed 100644
--- a/camlibs/polaroid/pdc320.c
+++ b/camlibs/polaroid/pdc320.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/polaroid/pdc640.c b/camlibs/polaroid/pdc640.c
index 0b3ece79c..14010f22f 100644
--- a/camlibs/polaroid/pdc640.c
+++ b/camlibs/polaroid/pdc640.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 14324b67b..a18cb495c 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -32,6 +32,7 @@
 # include <arpa/inet.h>
 #endif
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index da783679b..da71ca432 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -33,6 +33,7 @@
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
 #include <langinfo.h>
 #endif
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c
index 892976cf0..a60293274 100644
--- a/camlibs/ricoh/ricoh.c
+++ b/camlibs/ricoh/ricoh.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-port-log.h>
 
diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c
index 8b465ce61..c6a9d9ad7 100644
--- a/camlibs/sierra/library.c
+++ b/camlibs/sierra/library.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-port-log.h>
 
diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c
index 6f86827b8..0b1e69223 100644
--- a/camlibs/sipix/blink2.c
+++ b/camlibs/sipix/blink2.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef HAVE_LIBJPEG
 # include <jpeglib.h>
diff --git a/camlibs/smal/ultrapocket.c b/camlibs/smal/ultrapocket.c
index 368edde2c..65c14d12e 100644
--- a/camlibs/smal/ultrapocket.c
+++ b/camlibs/smal/ultrapocket.c
@@ -31,6 +31,7 @@
 #include <gphoto2/gphoto2-result.h>
 #include <bayer.h>
 #include <gamma.h>
+#include <unistd.h>
 
 #include "ultrapocket.h"
 #include "smal.h"
diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c
index e3e48c9b4..5c73fa374 100644
--- a/camlibs/sonydscf55/sony.c
+++ b/camlibs/sonydscf55/sony.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include "sony.h"
diff --git a/camlibs/soundvision/agfa_cl18.c b/camlibs/soundvision/agfa_cl18.c
index 1b5516764..8c7cb3393 100644
--- a/camlibs/soundvision/agfa_cl18.c
+++ b/camlibs/soundvision/agfa_cl18.c
@@ -15,6 +15,7 @@
 #ifdef OS2
 #include <db.h>
 #endif
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include "gphoto2-endian.h"
diff --git a/camlibs/soundvision/tiger_fastflicks.c b/camlibs/soundvision/tiger_fastflicks.c
index bc175616b..35c09c34d 100644
--- a/camlibs/soundvision/tiger_fastflicks.c
+++ b/camlibs/soundvision/tiger_fastflicks.c
@@ -29,6 +29,7 @@
 #ifdef OS2
 #include <db.h>
 #endif
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include "gphoto2-endian.h"
diff --git a/camlibs/spca50x/spca50x-flash.c b/camlibs/spca50x/spca50x-flash.c
index 7df9b8ed8..3b60d9cb3 100644
--- a/camlibs/spca50x/spca50x-flash.c
+++ b/camlibs/spca50x/spca50x-flash.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c
index c7472a786..8c761011b 100644
--- a/camlibs/spca50x/spca50x-sdram.c
+++ b/camlibs/spca50x/spca50x-sdram.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 #include "gphoto2-endian.h"
 
diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c
index c7dbde6cb..06f667109 100644
--- a/camlibs/spca50x/spca50x.c
+++ b/camlibs/spca50x/spca50x.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <gphoto2/gphoto2.h>
 #include "gphoto2-endian.h"
 
diff --git a/camlibs/tp6801/tp6801.c b/camlibs/tp6801/tp6801.c
index baf8041e3..36b494224 100644
--- a/camlibs/tp6801/tp6801.c
+++ b/camlibs/tp6801/tp6801.c
@@ -33,6 +33,7 @@
 #ifdef HAVE_LIBGD
 #include <gd.h>
 #endif
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-result.h>
 #include "tp6801.h"
diff --git a/libgphoto2_port/gphoto2/gphoto2-port-portability.h b/libgphoto2_port/gphoto2/gphoto2-port-portability.h
index 64d2d8497..b6e29acba 100644
--- a/libgphoto2_port/gphoto2/gphoto2-port-portability.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-portability.h
@@ -63,6 +63,8 @@ typedef struct {
 # define gp_system_dirent	  WIN32_FIND_DATA *
 # define gp_system_dir_delim	  '\\'
 
+# define sleep(x) usleep((x) * 1000 * 1000)
+
 /************************************************************************
  * End WIN32 definitions
  ************************************************************************/