projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove OS/2 from the list of supported platforms
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
522805e
..
cba589b
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-7,7
+7,7
@@
* to deserve their own file but don't really fit in
* any other file.
*
* to deserve their own file but don't really fit in
* any other file.
*
- * Copyright : Written by and Copyright (C) 2001-20
18
the
+ * Copyright : Written by and Copyright (C) 2001-20
20
the
* Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-48,9
+48,9
@@
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
-#if !defined(_WIN32)
&& !defined(__OS2__)
+#if !defined(_WIN32)
#include <unistd.h>
#include <unistd.h>
-#endif /* #if !defined(_WIN32)
&& !defined(__OS2__)
*/
+#endif /* #if !defined(_WIN32) */
#include <string.h>
#include <ctype.h>
#include <assert.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
@@
-647,11
+647,11
@@
char * make_path(const char * dir, const char * file)
}
if ((dir == NULL) || (*dir == '\0') /* No directory specified */
}
if ((dir == NULL) || (*dir == '\0') /* No directory specified */
-#if defined(_WIN32)
|| defined(__OS2__)
+#if defined(_WIN32)
|| (*file == '\\') || (file[1] == ':') /* Absolute path (DOS) */
|| (*file == '\\') || (file[1] == ':') /* Absolute path (DOS) */
-#else /* ifndef _WIN32
|| __OS2__
*/
+#else /* ifndef _WIN32 */
|| (*file == '/') /* Absolute path (U*ix) */
|| (*file == '/') /* Absolute path (U*ix) */
-#endif /* ifndef _WIN32
|| __OS2__
*/
+#endif /* ifndef _WIN32 */
)
{
return strdup(file);
)
{
return strdup(file);
@@
-683,17
+683,17
@@
char * make_path(const char * dir, const char * file)
}
assert(NULL != path);
}
assert(NULL != path);
-#if defined(_WIN32)
|| defined(__OS2__)
+#if defined(_WIN32)
if (path[strlen(path)-1] != '\\')
{
strlcat(path, "\\", path_size);
}
if (path[strlen(path)-1] != '\\')
{
strlcat(path, "\\", path_size);
}
-#else /* ifndef _WIN32
|| __OS2__
*/
+#else /* ifndef _WIN32 */
if (path[strlen(path)-1] != '/')
{
strlcat(path, "/", path_size);
}
if (path[strlen(path)-1] != '/')
{
strlcat(path, "/", path_size);
}
-#endif /* ifndef _WIN32
|| __OS2__
*/
+#endif /* ifndef _WIN32 */
strlcat(path, file, path_size);
return path;
strlcat(path, file, path_size);
return path;
@@
-841,10
+841,6
@@
int privoxy_millisleep(unsigned milliseconds)
#elif defined (_WIN32)
Sleep(milliseconds);
#elif defined (_WIN32)
Sleep(milliseconds);
- return 0;
-#elif defined(__OS2__)
- DosSleep(milliseconds * 10);
-
return 0;
#else
#warning Missing privoxy_milisleep() implementation. delay-response{} will not work.
return 0;
#else
#warning Missing privoxy_milisleep() implementation. delay-response{} will not work.