diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:32:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:32:24 +0000 |
| commit | 237f009a1ee086c00b5632e1b9312139d1cd4fb9 (patch) | |
| tree | f435cc87e102203aabb13b72e26ef0ddb76b23bd /shell | |
| parent | 700d13f939003b46920cb0f42240e4ec81d521aa (diff) | |
INTEGRATION: CWS desktintgr02 (1.2.8); FILE MERGED
2004/07/29 09:14:07 deuce 1.2.8.1: Issue number: 21110
Submitted by: Gorden Lin {gorden.lin@sun.com}
Reviewed by: Tino Rachui {tino.rachui@sun.com}
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/columninfo/makefile.mk | 5 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/infotips/makefile.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk index b2e3bb410060..881f925ac52c 100644 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2004-04-07 11:13:26 $ +# last change: $Author: hr $ $Date: 2004-09-08 14:31:58 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk index 6eaa6388ed2b..753adf37c2f6 100644 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ b/shell/source/win32/shlxthandler/infotips/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2004-04-07 11:13:50 $ +# last change: $Author: hr $ $Date: 2004-09-08 14:32:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- |