Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
657d08d3
Commit
657d08d3
authored
Oct 27, 2011
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall.
parent
6e724ca2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
12 deletions
+22
-12
lib-src/ChangeLog
lib-src/ChangeLog
+4
-0
lib-src/emacsclient.c
lib-src/emacsclient.c
+2
-2
src/ChangeLog
src/ChangeLog
+7
-0
src/image.c
src/image.c
+1
-1
src/w32.c
src/w32.c
+3
-3
src/w32font.c
src/w32font.c
+2
-2
src/w32reg.c
src/w32reg.c
+3
-4
No files found.
lib-src/ChangeLog
View file @
657d08d3
2011-10-27 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (w32_getenv): Silence compiler warnings.
2011-09-07 Glenn Morris <rgm@gnu.org>
* etags.c (Fortran_functions): Handle "elemental" functions.
...
...
lib-src/emacsclient.c
View file @
657d08d3
...
...
@@ -359,7 +359,7 @@ w32_getenv (char *envvar)
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 @@ w32_getenv (char *envvar)
{
DWORD
size
;
if
(
size
=
ExpandEnvironmentStrings
(
value
,
NULL
,
0
))
if
(
(
size
=
ExpandEnvironmentStrings
(
value
,
NULL
,
0
))
)
{
char
*
buffer
=
(
char
*
)
xmalloc
(
size
);
if
(
ExpandEnvironmentStrings
(
value
,
buffer
,
size
))
...
...
src/ChangeLog
View file @
657d08d3
2011-10-27 Juanma Barranquero <lekktu@gmail.com>
* 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 <lekktu@gmail.com>
* w32fns.c (w32_default_color_map): New function,
...
...
src/image.c
View file @
657d08d3
...
...
@@ -2015,7 +2015,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
/* 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));
...
...
src/w32.c
View file @
657d08d3
...
...
@@ -2892,12 +2892,12 @@ sys_rename (const char * oldname, const char * newname)
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 @@ w32_delayed_load (Lisp_Object libraries, Lisp_Object library_id)
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
;
...
...
src/w32font.c
View file @
657d08d3
...
...
@@ -1916,10 +1916,10 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
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. */
...
...
src/w32reg.c
View file @
657d08d3
...
...
@@ -147,9 +147,9 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
{
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 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
/* --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
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment