Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / webcit / sysdep.c

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index ae959505a24b93a65d189a305f1f4f4b6ad03f89..cbfba25f955d6e5e4c4687e6d3b4868940440fb1 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -25,18 +25,7 @@
 #include <sys/socket.h>
 #include <syslog.h>
 #include <sys/syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <limits.h>
 #include <sys/resource.h>
 #include <netinet/in.h>
@@ -82,6 +71,8 @@ char file_crpt_file_cer[PATH_MAX]="";
 char file_etc_mimelist[PATH_MAX]="";
 
 const char editor_absolut_dir[PATH_MAX]=EDITORDIR;     /* nailed to what configure gives us. */
+const char markdown_editor_absolutedir[]=MARKDOWNEDITORDIR;
+
 char etc_dir[PATH_MAX];
 char static_dir[PATH_MAX];             /* calculated on startup */
 char static_local_dir[PATH_MAX];               /* calculated on startup */
@@ -90,7 +81,8 @@ char  *static_dirs[]={                                /* needs same sort order as the web mapping */
        (char*)static_dir,                      /* our templates on disk */
        (char*)static_local_dir,                /* user provided templates disk */
        (char*)editor_absolut_dir,              /* the editor on disk */
-       (char*)static_icon_dir                  /* our icons... */
+       (char*)static_icon_dir,                  /* our icons... */
+       (char*)markdown_editor_absolutedir
 };
 
 int ExitPipe[2];