Fix build on Mac OS X (#953)

* Fix build on Mac OS X Fixes #952 * Fix FreeBSD build Include unistd.h in every file calling usleep()
gphoto · Jan 12, 2024 · cd9230b · cd9230b
1 parent 08d0369
commit cd9230b
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 11 deletions.
diff --git a/camlibs/digita/serial.c b/camlibs/digita/serial.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "libgphoto2/gphoto2-endian.h"
 #include "digita.h"
@@ -336,4 +337,3 @@ int digita_serial_open(CameraPrivateLibrary *dev, Camera *camera)
 
 	return negotiated ? 0 : -1;
 }
-
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
@@ -43,6 +43,7 @@
 # include <sys/mount.h>
 #endif
 #include <fcntl.h>
+#include <unistd.h>
 
 /* will happen only on Win32 */
 #ifndef HAVE_LSTAT

diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
@@ -414,8 +415,3 @@ camera_init (Camera *camera, GPContext *context)
 
 
 }
-
-
-
-
-
diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>

diff --git a/camlibs/jl2005c/jl2005c.c b/camlibs/jl2005c/jl2005c.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>

diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include	<unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
@@ -434,4 +435,3 @@ int camera_init (Camera *camera, GPContext *context) {
 
         return (GP_OK);
 }
-
diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
+
 #include <gphoto2/gphoto2.h>
 
 #include "libgphoto2/i18n.h"

diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <gphoto2/gphoto2.h>
 
 #include "libgphoto2/i18n.h"

diff --git a/camlibs/mars/mars.c b/camlibs/mars/mars.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
+#include <unistd.h>
 
 #include <libgphoto2/gamma.h>
 

diff --git a/camlibs/mustek/io.c b/camlibs/mustek/io.c
@@ -30,6 +30,7 @@
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
+#include <unistd.h>
 
 
 #include "io.h"

diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c
@@ -30,6 +30,7 @@
 #include "io.h"
 
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/time.h>
 
 

diff --git a/camlibs/mustek/usb.c b/camlibs/mustek/usb.c
@@ -27,6 +27,7 @@
 	Implemenation of the USB Version of ExecuteCommand
 */
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>

diff --git a/camlibs/panasonic/coolshot/library.c b/camlibs/panasonic/coolshot/library.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <gphoto2/gphoto2.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "libgphoto2/i18n.h"
 
@@ -726,5 +727,3 @@ int coolshot_build_thumbnail (char *data, int *size)
 
 	return( GP_OK );
 }
-
-
diff --git 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/ptp2/fujiptpip.c b/camlibs/ptp2/fujiptpip.c
@@ -49,6 +49,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_SELECT_H

diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_SELECT_H

diff --git a/camlibs/quicktake1x0/qtk-helpers.c b/camlibs/quicktake1x0/qtk-helpers.c
@@ -71,7 +71,7 @@ int qtk_ppm_size(int width, int height) {
 	return len;
 }
 
-unsigned char getbithuff (int nbits, unsigned char **raw, ushort *huff)
+unsigned char getbithuff (int nbits, unsigned char **raw, unsigned short *huff)
 {
 	static unsigned bitbuf = 0;
 	static int vbits = 0;

diff --git a/camlibs/quicktake1x0/quicktake1x0.c b/camlibs/quicktake1x0/quicktake1x0.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 

diff --git 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/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 "libgphoto2/gphoto2-endian.h"

diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include "libgphoto2/gphoto2-endian.h"
@@ -252,4 +253,3 @@ int pdrm11_delete_file(GPPort *port, int picNum)
 
 	return(GP_OK);
 }
-