diff --git a/.gitignore b/.gitignore
index 926b13e4..453aaaac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,11 @@ elog
logbooks/*
locext
git-revision.h
+*.tlog
+*.sbr
+*.pdb
+*.obj
+*.sdf
+*.suo
+NT/Debug/
+*.user
diff --git a/NT/elconv.vcxproj b/NT/elconv.vcxproj
index e543d176..aecd40a8 100644
--- a/NT/elconv.vcxproj
+++ b/NT/elconv.vcxproj
@@ -18,6 +18,7 @@
Application
false
MultiByte
+ v110
Application
diff --git a/NT/elog.vcxproj b/NT/elog.vcxproj
index bb2966a8..2846b8a4 100644
--- a/NT/elog.vcxproj
+++ b/NT/elog.vcxproj
@@ -18,6 +18,7 @@
Application
false
MultiByte
+ v110
Application
diff --git a/NT/elogd.vcxproj b/NT/elogd.vcxproj
index b0dff1a7..7f561ac4 100644
--- a/NT/elogd.vcxproj
+++ b/NT/elogd.vcxproj
@@ -23,6 +23,7 @@
Application
false
MultiByte
+ v110
diff --git a/NT/locext.vcxproj b/NT/locext.vcxproj
index 8c528853..b7c5157e 100644
--- a/NT/locext.vcxproj
+++ b/NT/locext.vcxproj
@@ -23,6 +23,7 @@
Application
false
MultiByte
+ v110
diff --git a/src/elogd.c b/src/elogd.c
index eb7bc92b..3faa8f17 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -26493,7 +26493,7 @@ void show_uploader_json(LOGBOOK *lbs)
{
char charset[256];
char filename[256], thumbname[256], attchname[256];
- int i, j;
+ int i, j, attch_count;
// maximum number of files that can be uploaded this way (drag and drop into the editor)
const long MAX_FILE_COUNT = 100;
@@ -26511,7 +26511,7 @@ void show_uploader_json(LOGBOOK *lbs)
strcpy(charset, DEFAULT_HTTP_CHARSET);
rsprintf("Content-Type: application/json;charset=%s\r\n\r\n", charset);
- long attch_count = strtol(getparam("drop-count"), NULL, 10);
+ attch_count = strtol(getparam("drop-count"), NULL, 10);
// limit the number of files that can be uploaded
if(attch_count > MAX_FILE_COUNT) {
@@ -26587,7 +26587,7 @@ void interprete(char *lbook, char *path)
edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80],
full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment,
group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH],
- thumb_name[256], sid[32], error_str[256];
+ thumb_name[256], sid[32], error_str[256], *s;
LOGBOOK *lbs;
FILE *f;
@@ -26617,7 +26617,7 @@ void interprete(char *lbook, char *path)
rsputs(loc(getparam("value")));
/* dummy strings for JS-only translations */
- char *s = loc("Drop attachments here...");
+ s = loc("Drop attachments here...");
s = loc("Insert Timestamp");
if (s)
s = NULL; // avoid compiler warning
diff --git a/src/elogd.h b/src/elogd.h
index d82b14cb..e03b8ddf 100644
--- a/src/elogd.h
+++ b/src/elogd.h
@@ -74,6 +74,7 @@
#include
#include
#include
+#include
#else