aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-11-06 09:40:50 +0100
committerJakob Odersky <jodersky@gmail.com>2014-11-06 09:40:50 +0100
commit4a69987a0b989a46096acd60e881d104a249a636 (patch)
tree83675d288b65fd78a2bb236d1b39d169482098b7
parent182350a4852d58b531217dabdd1104f69c9f0a35 (diff)
parent1688e167c522b7082c657a6fb9c743b0e9105004 (diff)
downloadk8055-4a69987a0b989a46096acd60e881d104a249a636.tar.gz
k8055-4a69987a0b989a46096acd60e881d104a249a636.tar.bz2
k8055-4a69987a0b989a46096acd60e881d104a249a636.zip
Merge pull request #2 from grottenolm/master
make it gcc 4.7 compatible (just added a cast from void* malloc to k8055_device*
-rw-r--r--src/k8055.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/k8055.c b/src/k8055.c
index a5b9cd2..6f3bc17 100644
--- a/src/k8055.c
+++ b/src/k8055.c
@@ -226,7 +226,7 @@ int k8055_open_device(int port, k8055_device** device) {
}
k8055_device* _device = NULL;
- _device = malloc(sizeof(k8055_device));
+ _device = (k8055_device*)malloc(sizeof(k8055_device));
if (_device == NULL) {
print_error("could not allocate memory for device");
return K8055_ERROR_MEM;