diff options
| author | Paul Eggert | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/callproc.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.zip | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/callproc.c b/src/callproc.c index 4c17cecdced..bc4c6a2f20d 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1278,7 +1278,7 @@ getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen, | |||
| 1278 | { | 1278 | { |
| 1279 | if (SBYTES (entry) > varlen && SREF (entry, varlen) == '=') | 1279 | if (SBYTES (entry) > varlen && SREF (entry, varlen) == '=') |
| 1280 | { | 1280 | { |
| 1281 | *value = (char *) SDATA (entry) + (varlen + 1); | 1281 | *value = SSDATA (entry) + (varlen + 1); |
| 1282 | *valuelen = SBYTES (entry) - (varlen + 1); | 1282 | *valuelen = SBYTES (entry) - (varlen + 1); |
| 1283 | return 1; | 1283 | return 1; |
| 1284 | } | 1284 | } |
| @@ -1310,7 +1310,7 @@ getenv_internal (const char *var, int varlen, char **value, int *valuelen, | |||
| 1310 | = Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay); | 1310 | = Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay); |
| 1311 | if (STRINGP (display)) | 1311 | if (STRINGP (display)) |
| 1312 | { | 1312 | { |
| 1313 | *value = (char *) SDATA (display); | 1313 | *value = SSDATA (display); |
| 1314 | *valuelen = SBYTES (display); | 1314 | *valuelen = SBYTES (display); |
| 1315 | return 1; | 1315 | return 1; |
| 1316 | } | 1316 | } |
| @@ -1594,4 +1594,3 @@ See `setenv' and `getenv'. */); | |||
| 1594 | defsubr (&Sgetenv_internal); | 1594 | defsubr (&Sgetenv_internal); |
| 1595 | defsubr (&Scall_process_region); | 1595 | defsubr (&Scall_process_region); |
| 1596 | } | 1596 | } |
| 1597 | |||