You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/03/26 17:54:30 UTC
svn commit: r641400 - in /harmony/enhanced/classlib/trunk/modules:
awt/src/main/native/lcmm/shared/ luni/src/main/native/launcher/shared/
portlib/src/main/native/port/windows/ portlib/src/main/native/thread/windows/
Author: tellison
Date: Wed Mar 26 09:54:20 2008
New Revision: 641400
URL: http://svn.apache.org/viewvc?rev=641400&view=rev
Log:
Fix compiler warnings raised as errors on MS compiler,
use posix names, missing include file, and redefined const.
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyosdump.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/thrdsup.h
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c?rev=641400&r1=641399&r2=641400&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c Wed Mar 26 09:54:20 2008
@@ -27,7 +27,7 @@
int gl_cmsErrorHandler(int errorCode, const char *msg) {
if(errorCode == LCMS_ERRC_ABORTED) {
- errMsg = strdup(msg); // Throw exception later, after returning control from cmm
+ errMsg = _strdup(msg); // Throw exception later, after returning control from cmm
}
return 1;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c?rev=641400&r1=641399&r2=641400&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c Wed Mar 26 09:54:20 2008
@@ -47,7 +47,7 @@
#define HARMONY_JARRUNNER_CLASSNAME "org.apache.harmony.vm.JarRunner"
#if defined(WIN32)
-#define PLATFORM_STRNICMP strnicmp
+#define PLATFORM_STRNICMP _strnicmp
#endif
#if defined(LINUX) || defined(FREEBSD) || defined(AIX) || defined(MACOSX) || defined(ZOS)
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c?rev=641400&r1=641399&r2=641400&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c Wed Mar 26 09:54:20 2008
@@ -30,6 +30,7 @@
#undef CDEV_CURRENT_FUNCTION
#include <string.h>
+#include <stdio.h>
#include "portpriv.h"
#include "portnls.h"
#include "hyportptb.h"
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyosdump.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyosdump.c?rev=641400&r1=641399&r2=641400&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyosdump.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyosdump.c Wed Mar 26 09:54:20 2008
@@ -315,7 +315,7 @@
{
pidStore[0] = '-';
/* this env var is set to append a unique identifier to the dump file name */
- itoa (GetCurrentProcessId (), &pidStore[1], 10);
+ _itoa (GetCurrentProcessId (), &pidStore[1], 10);
}
else
{
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/thrdsup.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/thrdsup.h?rev=641400&r1=641399&r2=641400&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/thrdsup.h (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/thrdsup.h Wed Mar 26 09:54:20 2008
@@ -60,8 +60,9 @@
/* THREAD_SELF */
#define THREAD_SELF() (GetCurrentThread())
/* THREAD_YIELD */
-
+#if !defined(_WIN32_WINNT)
#define _WIN32_WINNT 0x0400
+#endif
#define THREAD_YIELD() (f_yield())
/* THREAD_CREATE */