harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r486243 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm: shared/cmmio.c windows/makefile
Date Tue, 12 Dec 2006 17:15:53 GMT
Author: apetrenko
Date: Tue Dec 12 09:15:51 2006
New Revision: 486243

URL: http://svn.apache.org/viewvc?view=rev&rev=486243
Log:
Makefile is changed to use compiler options from the common place
Compiler warnings are fixed

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmio.c
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmio.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmio.c?view=diff&rev=486243&r1=486242&r2=486243
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmio.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmio.c Tue Dec
12 09:15:51 2006
@@ -456,7 +456,7 @@
 // ------------------------- API
 
 
-
+#pragma warning(disable : 4028)
 LPLCMSICCPROFILE cmmOpenProfile(LPBYTE dataPtr, DWORD dwSize) {
 
   LPLCMSICCPROFILE Icc = cmsOpenProfileFromMem(dataPtr, dwSize);

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?view=diff&rev=486243&r1=486242&r2=486243
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Tue
Dec 12 09:15:51 2006
@@ -22,14 +22,7 @@
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-# TOFIX: fix warns and use default flags.  That is:
-# HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
-
-HYCFLAGS = \
-  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
-  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
-  /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
 
 BUILDFILES = \
   $(SHAREDSUB)cmmerror.obj \



Mime
View raw message