Skip to content

Commit e900868

Browse files
committed
win32: Fix compiler errors
Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
1 parent 4487f12 commit e900868

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

examples/camtest.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#include <string.h>
3030
#include "libfreenect.h"
3131

32+
#ifndef SIGQUIT // win32 compat
33+
#define SIGQUIT SIGTERM
34+
#endif
35+
3236

3337
void depth_cb(freenect_device* dev, void* data, uint32_t timestamp)
3438
{
@@ -47,7 +51,6 @@ void signalHandler(int signal)
4751
|| signal == SIGTERM
4852
|| signal == SIGQUIT)
4953
{
50-
printf(" %s; shutting down\n", sys_siglist[signal]);
5154
running = false;
5255
}
5356
}
@@ -75,7 +78,7 @@ int main(int argc, char** argv)
7578
return ret;
7679
if (num_devices == 0)
7780
{
78-
printf("No devices found!\n");
81+
printf("No device found!\n");
7982
freenect_shutdown(fn_ctx);
8083
return 1;
8184
}
@@ -127,11 +130,15 @@ int main(int argc, char** argv)
127130

128131
}
129132

133+
printf("Shutting down\n");
134+
130135
// Stop everything and shutdown.
131136
freenect_stop_depth(fn_dev);
132137
freenect_stop_video(fn_dev);
133138
freenect_close_device(fn_dev);
134139
freenect_shutdown(fn_ctx);
135140

141+
printf("Done!\n");
142+
136143
return 0;
137144
}

examples/glview.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <GL/glut.h>
4040
#endif
4141

42+
#define _USE_MATH_DEFINES
4243
#include <math.h>
4344

4445
pthread_t freenect_thread;
@@ -232,9 +233,9 @@ void keyPressed(unsigned char key, int x, int y)
232233
mirror = mirror ? FREENECT_OFF : FREENECT_ON;
233234
}
234235
if (key == 'n') {
235-
static freenect_flag_value near = FREENECT_ON;
236-
freenect_set_flag(f_dev, FREENECT_NEAR_MODE, near);
237-
near = near ? FREENECT_OFF : FREENECT_ON;
236+
static freenect_flag_value near_mode = FREENECT_ON;
237+
freenect_set_flag(f_dev, FREENECT_NEAR_MODE, near_mode);
238+
near_mode = near_mode ? FREENECT_OFF : FREENECT_ON;
238239
}
239240
if (key == '1') {
240241
freenect_set_led(f_dev,LED_GREEN);

examples/micview.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ int main(int argc, char** argv) {
180180

181181
state.max_samples = 256 * 60;
182182
state.current_idx = 0;
183-
state.buffers[0] = malloc(state.max_samples * sizeof(int32_t));
184-
state.buffers[1] = malloc(state.max_samples * sizeof(int32_t));
185-
state.buffers[2] = malloc(state.max_samples * sizeof(int32_t));
186-
state.buffers[3] = malloc(state.max_samples * sizeof(int32_t));
183+
state.buffers[0] = (int32_t*)malloc(state.max_samples * sizeof(int32_t));
184+
state.buffers[1] = (int32_t*)malloc(state.max_samples * sizeof(int32_t));
185+
state.buffers[2] = (int32_t*)malloc(state.max_samples * sizeof(int32_t));
186+
state.buffers[3] = (int32_t*)malloc(state.max_samples * sizeof(int32_t));
187187
memset(state.buffers[0], 0, state.max_samples * sizeof(int32_t));
188188
memset(state.buffers[1], 0, state.max_samples * sizeof(int32_t));
189189
memset(state.buffers[2], 0, state.max_samples * sizeof(int32_t));

platform/windows/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef long ssize_t;
3838
#endif // _SSIZE_T_DEFINED
3939

4040

41-
void usleep(__int64 usec)
41+
static void usleep(__int64 usec)
4242
{
4343
// Convert to 100 nanosecond interval, negative for relative time.
4444
LARGE_INTEGER ft;

0 commit comments

Comments
 (0)