diff options
| author | Dan Nicolaescu | 2010-04-25 15:16:58 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-04-25 15:16:58 -0700 |
| commit | 39e2ad1b9fef5b0437ed18c77bd703003a2b8e54 (patch) | |
| tree | de4ba811bfa01e91b4ac0fbc1edbeadac226bd02 /src/fns.c | |
| parent | 6bdf5d652360b79c8ee6194e8dd1b23ef4721a53 (diff) | |
| download | emacs-39e2ad1b9fef5b0437ed18c77bd703003a2b8e54.tar.gz emacs-39e2ad1b9fef5b0437ed18c77bd703003a2b8e54.zip | |
Remove all NO_ARG_ARRAY uses.
* fns.c (concat2, concat3, nconc2):
* eval.c (apply1, call1, call2, call3, call4, call5, call6)
(call7): Remove NO_ARG_ARRAY usage, assume it's always true.
* m/xtensa.h (NO_ARG_ARRAY):
* m/template.h (NO_ARG_ARRAY):
* m/sparc.h (NO_ARG_ARRAY):
* m/sh3.h (NO_ARG_ARRAY):
* m/mips.h (NO_ARG_ARRAY):
* m/macppc.h (NO_ARG_ARRAY):
* m/iris4d.h (NO_ARG_ARRAY):
* m/intel386.h (NO_ARG_ARRAY):
* m/ibms390x.h (NO_ARG_ARRAY):
* m/ibms390.h (NO_ARG_ARRAY):
* m/ibmrs6000.h (NO_ARG_ARRAY):
* m/ia64.h (NO_ARG_ARRAY):
* m/hp800.h (NO_ARG_ARRAY):
* m/arm.h (NO_ARG_ARRAY):
* m/amdx86-64.h (NO_ARG_ARRAY):
* m/alpha.h (NO_ARG_ARRAY): Remove definition.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 12 |
1 files changed, 0 insertions, 12 deletions
| @@ -392,14 +392,10 @@ Lisp_Object | |||
| 392 | concat2 (s1, s2) | 392 | concat2 (s1, s2) |
| 393 | Lisp_Object s1, s2; | 393 | Lisp_Object s1, s2; |
| 394 | { | 394 | { |
| 395 | #ifdef NO_ARG_ARRAY | ||
| 396 | Lisp_Object args[2]; | 395 | Lisp_Object args[2]; |
| 397 | args[0] = s1; | 396 | args[0] = s1; |
| 398 | args[1] = s2; | 397 | args[1] = s2; |
| 399 | return concat (2, args, Lisp_String, 0); | 398 | return concat (2, args, Lisp_String, 0); |
| 400 | #else | ||
| 401 | return concat (2, &s1, Lisp_String, 0); | ||
| 402 | #endif /* NO_ARG_ARRAY */ | ||
| 403 | } | 399 | } |
| 404 | 400 | ||
| 405 | /* ARGSUSED */ | 401 | /* ARGSUSED */ |
| @@ -407,15 +403,11 @@ Lisp_Object | |||
| 407 | concat3 (s1, s2, s3) | 403 | concat3 (s1, s2, s3) |
| 408 | Lisp_Object s1, s2, s3; | 404 | Lisp_Object s1, s2, s3; |
| 409 | { | 405 | { |
| 410 | #ifdef NO_ARG_ARRAY | ||
| 411 | Lisp_Object args[3]; | 406 | Lisp_Object args[3]; |
| 412 | args[0] = s1; | 407 | args[0] = s1; |
| 413 | args[1] = s2; | 408 | args[1] = s2; |
| 414 | args[2] = s3; | 409 | args[2] = s3; |
| 415 | return concat (3, args, Lisp_String, 0); | 410 | return concat (3, args, Lisp_String, 0); |
| 416 | #else | ||
| 417 | return concat (3, &s1, Lisp_String, 0); | ||
| 418 | #endif /* NO_ARG_ARRAY */ | ||
| 419 | } | 411 | } |
| 420 | 412 | ||
| 421 | DEFUN ("append", Fappend, Sappend, 0, MANY, 0, | 413 | DEFUN ("append", Fappend, Sappend, 0, MANY, 0, |
| @@ -2344,14 +2336,10 @@ Lisp_Object | |||
| 2344 | nconc2 (s1, s2) | 2336 | nconc2 (s1, s2) |
| 2345 | Lisp_Object s1, s2; | 2337 | Lisp_Object s1, s2; |
| 2346 | { | 2338 | { |
| 2347 | #ifdef NO_ARG_ARRAY | ||
| 2348 | Lisp_Object args[2]; | 2339 | Lisp_Object args[2]; |
| 2349 | args[0] = s1; | 2340 | args[0] = s1; |
| 2350 | args[1] = s2; | 2341 | args[1] = s2; |
| 2351 | return Fnconc (2, args); | 2342 | return Fnconc (2, args); |
| 2352 | #else | ||
| 2353 | return Fnconc (2, &s1); | ||
| 2354 | #endif /* NO_ARG_ARRAY */ | ||
| 2355 | } | 2343 | } |
| 2356 | 2344 | ||
| 2357 | DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0, | 2345 | DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0, |