diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
| commit | 415835ce3d2daa9ecd4100e76d58d93b3afa2db0 (patch) | |
| tree | 755d041ea06a9b1c05fc72687c9dd5c6e98bbe73 /toxmsi/toxmsi.h | |
| parent | 988922bdeb94dd83e61ed387b29187ac4c9936e0 (diff) | |
| parent | 2bdce934373d238778bc77a04198bd3f1481542f (diff) | |
Merge branch 'master' into harden
Also removed some old, useless loading code.
Diffstat (limited to 'toxmsi/toxmsi.h')
| -rw-r--r-- | toxmsi/toxmsi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxmsi/toxmsi.h b/toxmsi/toxmsi.h index 69d5144a..d8985c64 100644 --- a/toxmsi/toxmsi.h +++ b/toxmsi/toxmsi.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #define _MSI_IMPL_H_ | 28 | #define _MSI_IMPL_H_ |
| 29 | 29 | ||
| 30 | #include <inttypes.h> | 30 | #include <inttypes.h> |
| 31 | #include "../toxcore/tox.h" | 31 | #include "tox.h" |
| 32 | #include <pthread.h> | 32 | #include <pthread.h> |
| 33 | 33 | ||
| 34 | #define MCBTYPE void | 34 | #define MCBTYPE void |