merge

2 files changed, 4 insertions, 4 deletions

diff --git a/dpid/main.c b/dpid/main.c
index 83c23f9f..969ef690 100644
--- a/dpid/main.c
+++ b/dpid/main.c
@@ -68,7 +68,7 @@ static int start_filter_plugin(struct dp dpi_attr)
    }
    if (pid == 0) {
       /* Child, start plugin */
-      if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+      if (execl(dpi_attr.path, dpi_attr.path, (char*)NULL) == -1) {
          ERRMSG("start_plugin", "execl", errno);
          MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
          exit(1);
@@ -100,7 +100,7 @@ static void start_server_plugin(struct dp dpi_attr)
       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
       exit(1);
    }
-   if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+   if (execl(dpi_attr.path, dpi_attr.path, (char*)NULL) == -1) {
       ERRMSG("start_plugin", "execl", errno);
       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
       exit(1);
diff --git a/src/IO/dpi.c b/src/IO/dpi.c
index 963b3a14..3ad1c7ed 100644
--- a/src/IO/dpi.c
+++ b/src/IO/dpi.c
@@ -299,9 +299,9 @@ static int Dpi_start_dpid(void)
       /* This is the child process.  Execute the command. */
       char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
       Dpi_close_fd(st_pipe[0]);
-      if (execl(path1, "dpid", NULL) == -1) {
+      if (execl(path1, "dpid", (char*)NULL) == -1) {
          dFree(path1);
-         if (execlp("dpid", "dpid", NULL) == -1) {
+         if (execlp("dpid", "dpid", (char*)NULL) == -1) {
             MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
             do
                n = write(st_pipe[1], "ERROR", 5);