[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106201: src/image.c, src/w32*.c, lib
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106201: src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall. |
Date: |
Thu, 27 Oct 2011 02:59:21 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106201
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-10-27 02:59:21 +0200
message:
src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall.
modified:
lib-src/ChangeLog
lib-src/emacsclient.c
src/ChangeLog
src/image.c
src/w32.c
src/w32font.c
src/w32reg.c
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-09-07 07:28:05 +0000
+++ b/lib-src/ChangeLog 2011-10-27 00:59:21 +0000
@@ -1,3 +1,7 @@
+2011-10-27 Juanma Barranquero <address@hidden>
+
+ * emacsclient.c (w32_getenv): Silence compiler warnings.
+
2011-09-07 Glenn Morris <address@hidden>
* etags.c (Fortran_functions): Handle "elemental" functions.
=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c 2011-08-28 23:52:34 +0000
+++ b/lib-src/emacsclient.c 2011-10-27 00:59:21 +0000
@@ -359,7 +359,7 @@
char *value;
DWORD dwType;
- if (value = getenv (envvar))
+ if ((value = getenv (envvar)))
/* Found in the environment. strdup it, because values returned
by getenv cannot be free'd. */
return xstrdup (value);
@@ -382,7 +382,7 @@
{
DWORD size;
- if (size = ExpandEnvironmentStrings (value, NULL, 0))
+ if ((size = ExpandEnvironmentStrings (value, NULL, 0)))
{
char *buffer = (char *) xmalloc (size);
if (ExpandEnvironmentStrings (value, buffer, size))
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-10-26 14:07:31 +0000
+++ b/src/ChangeLog 2011-10-27 00:59:21 +0000
@@ -1,3 +1,10 @@
+2011-10-27 Juanma Barranquero <address@hidden>
+
+ * image.c (x_create_x_image_and_pixmap):
+ * w32.c (sys_rename, w32_delayed_load):
+ * w32font.c (fill_in_logfont):
+ * w32reg.c (x_get_string_resource): Silence compiler warnings.
+
2011-10-26 Juanma Barranquero <address@hidden>
* w32fns.c (w32_default_color_map): New function,
=== modified file 'src/image.c'
--- a/src/image.c 2011-09-16 10:25:39 +0000
+++ b/src/image.c 2011-10-27 00:59:21 +0000
@@ -2015,7 +2015,7 @@
/* Bitmaps with a depth less than 16 need a palette. */
/* BITMAPINFO structure already contains the first RGBQUAD. */
if (depth < 16)
- palette_colors = 1 << depth - 1;
+ palette_colors = 1 << (depth - 1);
*ximg = xmalloc (sizeof (XImage) + palette_colors * sizeof (RGBQUAD));
=== modified file 'src/w32.c'
--- a/src/w32.c 2011-09-09 01:06:52 +0000
+++ b/src/w32.c 2011-10-27 00:59:21 +0000
@@ -2892,12 +2892,12 @@
int i = 0;
oldname = map_w32_filename (oldname, NULL);
- if (o = strrchr (oldname, '\\'))
+ if ((o = strrchr (oldname, '\\')))
o++;
else
o = (char *) oldname;
- if (p = strrchr (temp, '\\'))
+ if ((p = strrchr (temp, '\\')))
p++;
else
p = temp;
@@ -5756,7 +5756,7 @@
for (dlls = XCDR (dlls); CONSP (dlls); dlls = XCDR (dlls))
{
CHECK_STRING_CAR (dlls);
- if (library_dll = LoadLibrary (SDATA (XCAR (dlls))))
+ if ((library_dll = LoadLibrary (SDATA (XCAR (dlls)))))
{
found = XCAR (dlls);
break;
=== modified file 'src/w32font.c'
--- a/src/w32font.c 2011-05-12 07:07:06 +0000
+++ b/src/w32font.c 2011-10-27 00:59:21 +0000
@@ -1916,10 +1916,10 @@
int spacing = XINT (tmp);
if (spacing < FONT_SPACING_MONO)
logfont->lfPitchAndFamily
- = logfont->lfPitchAndFamily & 0xF0 | VARIABLE_PITCH;
+ = (logfont->lfPitchAndFamily & 0xF0) | VARIABLE_PITCH;
else
logfont->lfPitchAndFamily
- = logfont->lfPitchAndFamily & 0xF0 | FIXED_PITCH;
+ = (logfont->lfPitchAndFamily & 0xF0) | FIXED_PITCH;
}
/* Process EXTRA info. */
=== modified file 'src/w32reg.c'
--- a/src/w32reg.c 2011-01-25 04:08:28 +0000
+++ b/src/w32reg.c 2011-10-27 00:59:21 +0000
@@ -147,9 +147,9 @@
{
char *resource;
- if (resource = w32_get_rdb_resource (rdb, name))
+ if ((resource = w32_get_rdb_resource (rdb, name)))
return resource;
- if (resource = w32_get_rdb_resource (rdb, class))
+ if ((resource = w32_get_rdb_resource (rdb, class)))
return resource;
}
@@ -157,6 +157,5 @@
/* --quick was passed, so this is a no-op. */
return NULL;
- return (w32_get_string_resource (name, class, REG_SZ));
+ return w32_get_string_resource (name, class, REG_SZ);
}
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106201: src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall.,
Juanma Barranquero <=