diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/nan_warn.mk | |
parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/nan_warn.mk')
-rw-r--r-- | source/nan_warn.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/source/nan_warn.mk b/source/nan_warn.mk index 97a8bbf09e4..b685c13604d 100644 --- a/source/nan_warn.mk +++ b/source/nan_warn.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -50,16 +52,15 @@ else # # Irix warning info # - # 1001 # the source file does not end w/ a newline - # 1110 # unreachable statement - # 1201 # trailing comma in enums is nonstandard - # 1209 # constant controlling expressions - # 1355 # extra semicolon is ignored - # 1424 # unreferenced template paramaters - # 1681 # virtual function override - # 3201 # unreferenced formal paramaters + # 1001 # the source file does not end w/ a newline + # 1110 # unreachable statement + # 1201 # trailing comma in enums is nonstandard + # 1209 # constant controlling expressions + # 1355 # extra semicolon is ignored + # 1424 # unreferenced template paramaters + # 1681 # virtual function override + # 3201 # unreferenced formal paramaters # - LEVEL_1_C_WARNINGS = -fullwarn -woff 1001,1110,1201,1209,1355,1424,1681,3201 endif endif @@ -77,7 +78,7 @@ else ifeq ($(CCC),CC) ifeq ($(OS),irix) # MIPSpro Compilers - # see warning descriptions above + # see warning descriptions above LEVEL_1_CPP_WARNINGS = -woff 1001,1110,1201,1209,1355,1424,1681,3201 endif endif @@ -109,7 +110,7 @@ else ifeq ($(CC),cc) ifeq ($(OS),irix) # MIPSpro Compilers - # see warning descriptions above + # see warning descriptions above LEVEL_2_C_WARNINGS = -fullwarn -woff 1001,1209,1424,3201 endif ifeq ($(OS),solaris) @@ -146,7 +147,7 @@ else ifeq ($(CCC),CC) ifeq ($(OS),irix) # MIPSpro Compilers - # see warning descriptions above + # see warning descriptions above LEVEL_2_CPP_WARNINGS = -fullwarn -woff 1209,1424,3201 endif endif |