diff options
Diffstat (limited to 'protocols/AimOscar')
| -rw-r--r-- | protocols/AimOscar/src/conv.cpp | 8 | ||||
| -rw-r--r-- | protocols/AimOscar/src/utility.cpp | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp index f16a90cd84..04f87d068a 100644 --- a/protocols/AimOscar/src/conv.cpp +++ b/protocols/AimOscar/src/conv.cpp @@ -18,9 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "aim.h"
-#ifdef _MSC_VER
- #pragma warning( disable: 4706 )
-#endif
+#pragma warning( disable: 4706 )
char* process_status_msg (const char *str, const char* sn)
{
@@ -901,6 +899,4 @@ aimString::aimString(char* str) }
}
-#ifdef _MSC_VER
- #pragma warning( default: 4706 )
-#endif
+#pragma warning( default: 4706 )
diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp index 1ae59c437f..a113ee191d 100644 --- a/protocols/AimOscar/src/utility.cpp +++ b/protocols/AimOscar/src/utility.cpp @@ -558,13 +558,7 @@ int CAimProto::open_contact_file(const char* sn, const TCHAR* file, const char* if (fid < 0)
{
TCHAR errmsg[512];
- #if _MSC_VER > 1200
mir_sntprintf(errmsg, SIZEOF(errmsg), TranslateT("Failed to open file: %s %s"), path, __tcserror(NULL));
- #else
- TCHAR* err = mir_a2t(_strerror(NULL));
- mir_sntprintf(errmsg, SIZEOF(errmsg), TranslateT("Failed to open file: %s %s"), path, err);
- mir_free(err);
- #endif
ShowPopup((char*)errmsg, ERROR_POPUP | TCHAR_POPUP);
}
return fid;
|