You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/07/25 17:29:12 UTC
[1/2] lucy-clownfish git commit: Fix more Windows compiler warnings
Repository: lucy-clownfish
Updated Branches:
refs/heads/master ade0c09cc -> 8bfda8334
Fix more Windows compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/67f835be
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/67f835be
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/67f835be
Branch: refs/heads/master
Commit: 67f835be955452315407f8e295f5e10de052f037
Parents: ade0c09
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 25 17:24:42 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 25 17:24:42 2015 +0200
----------------------------------------------------------------------
compiler/common/charmonizer.c | 8 ++++++--
compiler/common/charmonizer.main | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/67f835be/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index fb0835a..debae83 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -8005,11 +8005,15 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
/* Compile as C++ under MSVC11 and below. */
chaz_CFlags_append(extra_cflags, "/TP");
}
+ else {
+ /* Fix warnings in flex generated code. */
+ chaz_CFlags_append(extra_cflags, "/DYY_USE_CONST");
+ }
chaz_CFlags_append(extra_cflags, "/W3");
/* Thwart stupid warnings. */
- chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");
- chaz_CFlags_append(extra_cflags, "/D_SCL_SECURE_NO_WARNINGS");
+ chaz_CFlags_append(extra_cflags,
+ "/D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /wd4996");
if (chaz_Probe_msvc_version_num() < 1300) {
/* Redefine 'for' to fix broken 'for' scoping under MSVC6. */
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/67f835be/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 0af5a78..0365656 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -118,11 +118,15 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
/* Compile as C++ under MSVC11 and below. */
chaz_CFlags_append(extra_cflags, "/TP");
}
+ else {
+ /* Fix warnings in flex generated code. */
+ chaz_CFlags_append(extra_cflags, "/DYY_USE_CONST");
+ }
chaz_CFlags_append(extra_cflags, "/W3");
/* Thwart stupid warnings. */
- chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");
- chaz_CFlags_append(extra_cflags, "/D_SCL_SECURE_NO_WARNINGS");
+ chaz_CFlags_append(extra_cflags,
+ "/D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /wd4996");
if (chaz_Probe_msvc_version_num() < 1300) {
/* Redefine 'for' to fix broken 'for' scoping under MSVC6. */
[2/2] lucy-clownfish git commit: Remove unused LUCY_DEBUG environment
variable
Posted by nw...@apache.org.
Remove unused LUCY_DEBUG environment variable
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/8bfda833
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/8bfda833
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/8bfda833
Branch: refs/heads/master
Commit: 8bfda83344e3af6166d338ae490469cd9583e93a
Parents: 67f835b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 25 17:27:15 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 25 17:27:15 2015 +0200
----------------------------------------------------------------------
.travis.yml | 18 +++++++++---------
appveyor.yml | 2 --
compiler/common/charmonizer.c | 3 ---
compiler/common/charmonizer.main | 3 ---
runtime/common/charmonizer.c | 3 ---
runtime/common/charmonizer.main | 3 ---
6 files changed, 9 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9538b05..2008a03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,15 +18,15 @@ language: perl
install: 'true'
script: devel/bin/travis-test.sh
env:
- - LUCY_DEBUG=1 CLOWNFISH_HOST=c
- - LUCY_DEBUG=1 CLOWNFISH_HOST=go
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.20
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.18
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.16
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.14
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.12
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.10
- - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.8
+ - CLOWNFISH_HOST=c
+ - CLOWNFISH_HOST=go
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.20
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.18
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.16
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.14
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.12
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.10
+ - CLOWNFISH_HOST=perl PERL_VERSION=5.8
git:
depth: 10
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index c153317..3192564 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,4 @@
environment:
- global:
- LUCY_DEBUG: 1
matrix:
- CLOWNFISH_HOST: c
MSVC_VERSION: 10
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index debae83..902ab12 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7987,9 +7987,6 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
if (getenv("LUCY_VALGRIND")) {
chaz_CFlags_append(extra_cflags, "-fno-inline-functions");
}
- if (getenv("LUCY_DEBUG")) {
- chaz_CFlags_append(extra_cflags, "-DLUCY_DEBUG");
- }
chaz_CFlags_append(extra_cflags,
"-pedantic -Wall -Wextra -Wno-variadic-macros");
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 0365656..0d86a26 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -100,9 +100,6 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
if (getenv("LUCY_VALGRIND")) {
chaz_CFlags_append(extra_cflags, "-fno-inline-functions");
}
- if (getenv("LUCY_DEBUG")) {
- chaz_CFlags_append(extra_cflags, "-DLUCY_DEBUG");
- }
chaz_CFlags_append(extra_cflags,
"-pedantic -Wall -Wextra -Wno-variadic-macros");
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index 2b0b2ea..a663997 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -8093,9 +8093,6 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
chaz_CFlags_append(extra_cflags,
"-DLUCY_VALGRIND -fno-inline-functions");
}
- if (getenv("LUCY_DEBUG")) {
- chaz_CFlags_append(extra_cflags, "-DLUCY_DEBUG");
- }
chaz_CFlags_append(extra_cflags,
"-pedantic -Wall -Wextra -Wno-variadic-macros");
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/8bfda833/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 97591c1..dd919c6 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -206,9 +206,6 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
chaz_CFlags_append(extra_cflags,
"-DLUCY_VALGRIND -fno-inline-functions");
}
- if (getenv("LUCY_DEBUG")) {
- chaz_CFlags_append(extra_cflags, "-DLUCY_DEBUG");
- }
chaz_CFlags_append(extra_cflags,
"-pedantic -Wall -Wextra -Wno-variadic-macros");