summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2015-04-18 16:28:15 -0400
committerAllen Winter <allen.winter@kdab.com>2015-04-18 16:28:15 -0400
commitb9e3658cf92ca2db3bdd9dd1e2a6332812be372c (patch)
tree92952d78deb874fa10611c87553e98b4525971cb /src
parentecbd550a5506eaa0035d3256018f4cee029f0607 (diff)
downloadlibical-git-b9e3658cf92ca2db3bdd9dd1e2a6332812be372c.tar.gz
remove DMALLOC conditional compilation
Diffstat (limited to 'src')
-rw-r--r--src/libical/icalmemory.c4
-rw-r--r--src/libical/icalmime.c10
-rw-r--r--src/libical/sspm.c4
3 files changed, 3 insertions, 15 deletions
diff --git a/src/libical/icalmemory.c b/src/libical/icalmemory.c
index c5234e9d..b7a392c5 100644
--- a/src/libical/icalmemory.c
+++ b/src/libical/icalmemory.c
@@ -54,10 +54,6 @@
#include "config.h"
#endif
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#include "icalmemory.h"
#include "icalerror.h"
diff --git a/src/libical/icalmime.c b/src/libical/icalmime.c
index 41aceee9..96c044d3 100644
--- a/src/libical/icalmime.c
+++ b/src/libical/icalmime.c
@@ -30,14 +30,10 @@
#include "icalerror.h"
#include "icalmemory.h"
#include "sspm.h"
-#include "stdlib.h"
+#include <stdlib.h>
#include <string.h> /* For strdup */
#include <stdio.h> /* for snprintf*/
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#if defined(_MSC_VER)
#define snprintf _snprintf
#define strcasecmp stricmp
@@ -190,7 +186,7 @@ icalcomponent* icalmime_parse(char* (*get_string)(char *s, size_t size,
return 0;
}
- memset(parts,0,sizeof(NUM_PARTS*sizeof(struct sspm_part)));
+ memset(parts,0,NUM_PARTS*sizeof(struct sspm_part));
sspm_parse_mime(parts,
NUM_PARTS, /* Max parts */
@@ -376,7 +372,7 @@ int icalmime_test(char* (*get_string)(char *s, size_t size, void *d),
return 0;
}
- memset(parts,0,sizeof(NUM_PARTS*sizeof(struct sspm_part)));
+ memset(parts,0,NUM_PARTS*sizeof(struct sspm_part));
sspm_parse_mime(parts,
NUM_PARTS, /* Max parts */
diff --git a/src/libical/sspm.c b/src/libical/sspm.c
index d237702b..cbe83490 100644
--- a/src/libical/sspm.c
+++ b/src/libical/sspm.c
@@ -42,10 +42,6 @@
#include <stdlib.h> /* for malloc, free */
#include <string.h> /* for strcasecmp */
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#if defined(_MSC_VER)
#define snprintf _snprintf
#define strcasecmp stricmp