summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/clipboard_linux.cc1
-rw-r--r--build/all.gyp1
-rw-r--r--build/common.gypi3
-rw-r--r--build/external_code.gypi8
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc1
-rw-r--r--chrome/browser/gtk/download_shelf_gtk.cc4
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp3
-rw-r--r--third_party/harfbuzz/harfbuzz.gyp3
-rw-r--r--third_party/libevent/libevent.gyp3
-rw-r--r--webkit/webkit.gyp4
10 files changed, 12 insertions, 19 deletions
diff --git a/base/clipboard_linux.cc b/base/clipboard_linux.cc
index 4d52038..7d568e1 100644
--- a/base/clipboard_linux.cc
+++ b/base/clipboard_linux.cc
@@ -178,7 +178,6 @@ void Clipboard::WriteWebSmartPaste() {
void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) {
const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data);
- int length = size->width() * size->height() * 4;
guchar* data = gfx::BGRAToRGBA(reinterpret_cast<const uint8_t*>(pixel_data),
size->width(), size->height(), 0);
diff --git a/build/all.gyp b/build/all.gyp
index fefcc17..feec2e3 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -4,7 +4,6 @@
{
'variables': {
- 'chromium_code': 1,
'conditions': [
['OS!="win"', {
'all_gyps%': 1,
diff --git a/build/common.gypi b/build/common.gypi
index 93565f3..40ce2fd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -169,6 +169,9 @@
'-fno-exceptions',
'-msse2',
'-mfpmath=sse',
+ '-Wall',
+ # TODO(sgk): when chromium_code targets are clean of warnings.
+ #'-Werror',
],
'ldflags': [
'-m32',
diff --git a/build/external_code.gypi b/build/external_code.gypi
index ca16f86..053fb61 100644
--- a/build/external_code.gypi
+++ b/build/external_code.gypi
@@ -4,6 +4,14 @@
{
'conditions': [
+ [ 'OS=="linux"', {
+ 'target_defaults': {
+ 'cflags!': [
+ '-Wall',
+ '-Werror',
+ ],
+ },
+ }],
[ 'OS=="win"', {
'target_defaults': {
'defines': [
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 4e4402e..22cf7d42 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -326,7 +326,6 @@ gboolean BookmarkBarGtk::OnToolbarExpose(GtkWidget* widget,
// A GtkToolbar's expose handler first draws a box. We don't want that so we
// need to propagate the expose event to all the container's children.
GList* children = gtk_container_get_children(GTK_CONTAINER(widget));
- GList* start = children;
while (children) {
GList *next = children->next;
gtk_container_propagate_expose(GTK_CONTAINER(widget),
diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc
index 1d2cb2b..9ba9f4a 100644
--- a/chrome/browser/gtk/download_shelf_gtk.cc
+++ b/chrome/browser/gtk/download_shelf_gtk.cc
@@ -130,15 +130,13 @@ DownloadShelfGtk::DownloadShelfGtk(TabContents* tab_contents)
gtk_box_pack_start(GTK_BOX(shelf_), padding_bg, FALSE, FALSE, 0);
// Create and pack the close button.
- GtkWidget* centering_vbox_;
close_button_.reset(CustomDrawButton::AddBarCloseButton(hbox_));
g_signal_connect(G_OBJECT(close_button_->widget()), "clicked",
G_CALLBACK(OnButtonClick), this);
// Create and pack the "Show all downloads..." link.
// TODO(estade): there are some pixels above and below the link that
- // can be clicked. I tried to fix this with a vbox (akin to |centering_vbox|
- // above), but no dice.
+ // can be clicked. I tried to fix this with a vbox, but no dice.
GtkWidget* link_box;
GtkWidget* link_button;
std::string link_text =
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 583d820..e46bc7e 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromium_code': 1,
- },
'includes': [
'../../build/common.gypi',
],
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp
index 9d5b408..b19680a 100644
--- a/third_party/harfbuzz/harfbuzz.gyp
+++ b/third_party/harfbuzz/harfbuzz.gyp
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromium_code': 1,
- },
'includes': [
'../../build/common.gypi',
],
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index 4230cb4..b9dcabc 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromium_code': 1,
- },
'includes': [
'../../build/common.gypi',
],
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index b31ea88..5f9179f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -3988,10 +3988,6 @@
# .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
'-Wno-multichar',
],
- # TODO(sgk): unnecessary once common.gypi gets Linux settings
- # necessary to avoid build failure due to warnings generated by:
- # ../third_party/WebKit/WebCore/dom/Document.cpp
- 'scons_remove' : {'CXXFLAGS' : ['-Werror']},
}],
['OS=="mac"', {
'actions': [