Sat Sep 23 06:49:12 PDT 2006 Brian Warner * must include stdafx.h for external programs to be able to link against us Fri Sep 22 23:44:52 PDT 2006 warner@lothar.com * hush compiler warnings Fri Sep 22 23:44:25 PDT 2006 warner@lothar.com * fix bug in include file that prevents compile under linux diff -rN -u old-phidget21.linux/cphidget.h new-phidget21.linux/cphidget.h --- old-phidget21.linux/cphidget.h 2006-09-23 14:39:04.000000000 -0700 +++ new-phidget21.linux/cphidget.h 2006-09-23 14:39:04.000000000 -0700 @@ -4,7 +4,7 @@ typedef struct CPhidget *CPhidgetHandle; #ifndef EXTERNALPROTO -//#include "stdafx.h" +#include "stdafx.h" #include "cphidgetattr.h" #include "cphidgetconstants.h" #include "cthread.h" diff -rN -u old-phidget21.linux/cphidgetmanager.h new-phidget21.linux/cphidgetmanager.h --- old-phidget21.linux/cphidgetmanager.h 2006-09-23 14:39:04.000000000 -0700 +++ new-phidget21.linux/cphidgetmanager.h 2006-09-23 14:39:04.000000000 -0700 @@ -13,13 +13,13 @@ extern int (CCONV *fptrDetachChange)(CPhidgetHandle phid, void *userPtr); extern void *fptrDetachChangeptr; -int CPhidgetManager_poll(); +int CPhidgetManager_poll(void); int CPhidgetAttachEvent(CPhidgetHandle phid); int CPhidgetDetachEvent(CPhidgetHandle phid); #endif -PHIDGET21_API int CCONV CPhidgetManager_initialize(); -PHIDGET21_API int CCONV CPhidgetManager_free(); +PHIDGET21_API int CCONV CPhidgetManager_initialize(void); +PHIDGET21_API int CCONV CPhidgetManager_free(void); PHIDGET21_API int CCONV CPhidgetManager_set_AttachHandler(int (CCONV *fptr)(CPhidgetHandle phid, void *userPtr), void *); PHIDGET21_API int CCONV CPhidgetManager_set_DetachHandler(int (CCONV *fptr)(CPhidgetHandle phid, void *userPtr), void *); PHIDGET21_API int CCONV CPhidgetManager_getAttachedDevices(CPhidgetHandle *phidArray[], int *count); diff -rN -u old-phidget21.linux/cthread.h new-phidget21.linux/cthread.h --- old-phidget21.linux/cthread.h 2006-09-23 14:39:04.000000000 -0700 +++ new-phidget21.linux/cthread.h 2006-09-23 14:39:04.000000000 -0700 @@ -43,9 +43,9 @@ int CThread_wait_on_event(EVENT *ev, EVENT_TIME time); void CThread_create_event(EVENT *ev); -int FindActiveDevices(); +int FindActiveDevices(void); int RegisterLocalDevice(CPhidgetHandle phid); -int StartCentralThread(); +int StartCentralThread(void); CThread_func_return_t ReadThreadFunction(CThread_func_arg_t arg); CThread_func_return_t WriteThreadFunction(CThread_func_arg_t arg); diff -rN -u old-phidget21.linux/stdafx.h new-phidget21.linux/stdafx.h --- old-phidget21.linux/stdafx.h 2006-09-23 14:39:04.000000000 -0700 +++ new-phidget21.linux/stdafx.h 2006-09-23 14:39:04.000000000 -0700 @@ -99,8 +99,9 @@ #define CCONV #define SLEEP(dlay) usleep(dlay*1000); #define ZEROMEM(var,size) memset(var, 0, size); - #ifndef PHIDGET21_API +# ifndef PHIDGET21_API #define PHIDGET21_API +# endif //typedef sem_t CRITICAL_SECTION; typedef void *HANDLE; #define INFINITE 0xFFFFFFFF @@ -126,7 +127,6 @@ #include "libusb/usb.h" #endif -#endif #include "cphidget.h"