X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=cba589bfa3ba78633e27704cf9715147bea697ab;hp=522805eac80714941f05c5f05a5ddb1a1e5f766e;hb=bfbc85f7b60d851fea0f04f75be6b2030e70d655;hpb=58a71f0b2a4edba28bf52613bea8911d5d051568 diff --git a/miscutil.c b/miscutil.c index 522805ea..cba589bf 100644 --- a/miscutil.c +++ b/miscutil.c @@ -7,7 +7,7 @@ * to deserve their own file but don't really fit in * any other file. * - * Copyright : Written by and Copyright (C) 2001-2018 the + * Copyright : Written by and Copyright (C) 2001-2020 the * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -48,9 +48,9 @@ #include #include #include -#if !defined(_WIN32) && !defined(__OS2__) +#if !defined(_WIN32) #include -#endif /* #if !defined(_WIN32) && !defined(__OS2__) */ +#endif /* #if !defined(_WIN32) */ #include #include #include @@ -647,11 +647,11 @@ char * make_path(const char * dir, const char * file) } if ((dir == NULL) || (*dir == '\0') /* No directory specified */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(_WIN32) || (*file == '\\') || (file[1] == ':') /* Absolute path (DOS) */ -#else /* ifndef _WIN32 || __OS2__ */ +#else /* ifndef _WIN32 */ || (*file == '/') /* Absolute path (U*ix) */ -#endif /* ifndef _WIN32 || __OS2__ */ +#endif /* ifndef _WIN32 */ ) { return strdup(file); @@ -683,17 +683,17 @@ char * make_path(const char * dir, const char * file) } assert(NULL != path); -#if defined(_WIN32) || defined(__OS2__) +#if defined(_WIN32) 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); } -#endif /* ifndef _WIN32 || __OS2__ */ +#endif /* ifndef _WIN32 */ strlcat(path, file, path_size); return path; @@ -841,10 +841,6 @@ int privoxy_millisleep(unsigned 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.