#435: fixed compiling error if no regex.h

nzbget · Aug 28, 2017 · 35d8aa5 · 35d8aa5
1 parent 9f80f45
commit 35d8aa5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/daemon/main/nzbget.h b/daemon/main/nzbget.h
@@ -69,7 +69,9 @@ compiled */
 #define SOCKLEN_T socklen_t
 
 /* Define to 1 if you have the <regex.h> header file. */
+#ifndef DISABLE_REGEX
 #define HAVE_REGEX_H 1
+#endif
 
 /* Suppress warnings */
 #define _CRT_SECURE_NO_DEPRECATE

diff --git a/daemon/queue/QueueEditor.cpp b/daemon/queue/QueueEditor.cpp
@@ -650,7 +650,7 @@ void QueueEditor::PrepareList(ItemList* itemList, IdList* idList,
 bool QueueEditor::BuildIdListFromNameList(IdList* idList, NameList* nameList, DownloadQueue::EMatchMode matchMode, DownloadQueue::EEditAction action)
 {
 #ifndef HAVE_REGEX_H
-	if (matchMode == mmRegEx)
+	if (matchMode == DownloadQueue::mmRegEx)
 	{
 		return false;
 	}

diff --git a/daemon/remote/BinRpc.cpp b/daemon/remote/BinRpc.cpp
@@ -871,7 +871,7 @@ void EditQueueBinCommand::Execute()
 	else
 	{
 #ifndef HAVE_REGEX_H
-		if ((QueueEditor::EMatchMode)matchMode == QueueEditor::mmRegEx)
+		if ((DownloadQueue::EMatchMode)matchMode == DownloadQueue::mmRegEx)
 		{
 			SendBoolResponse(false, "Edit-Command failed: the program was compiled without RegEx-support");
 			return;

diff --git a/daemon/util/Util.cpp b/daemon/util/Util.cpp
@@ -1687,7 +1687,7 @@ int RegEx::GetMatchStart(int index)
 #ifdef HAVE_REGEX_H
 	return m_matches[index].rm_so;
 #else
-	return nullptr;
+	return 0;
 #endif
 }