diff options
| author | Pavel Janík | 2001-10-24 06:32:53 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-10-24 06:32:53 +0000 |
| commit | a8818eb978c3c67ebd70a6ebb95eb33578074f21 (patch) | |
| tree | 7c4cd98e86c10204f595ccfe15b6365028d7de1c | |
| parent | 996fee11d7493276e55e66b01daa65f3738fbe02 (diff) | |
| download | emacs-a8818eb978c3c67ebd70a6ebb95eb33578074f21.tar.gz emacs-a8818eb978c3c67ebd70a6ebb95eb33578074f21.zip | |
Don't define max.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/widget.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 520f500c9fb..051d55e63a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2001-10-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1 | 2001-10-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> |
| 2 | 2 | ||
| 3 | * widget.c: Don't define max. | ||
| 4 | |||
| 3 | * process.c: Don't define max. | 5 | * process.c: Don't define max. |
| 4 | (create_process): Remove unused variable `buffer'. | 6 | (create_process): Remove unused variable `buffer'. |
| 5 | 7 | ||
diff --git a/src/widget.c b/src/widget.c index b4ec35dcd36..53091847c8f 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -54,8 +54,6 @@ Boston, MA 02111-1307, USA. */ | |||
| 54 | #include <signal.h> | 54 | #include <signal.h> |
| 55 | #include "syssignal.h" | 55 | #include "syssignal.h" |
| 56 | 56 | ||
| 57 | #define max(a, b) ((a) > (b) ? (a) : (b)) | ||
| 58 | |||
| 59 | /* This sucks: this is the first default that x-faces.el tries. This won't | 57 | /* This sucks: this is the first default that x-faces.el tries. This won't |
| 60 | be used unless neither the "Emacs.EmacsFrame" resource nor the | 58 | be used unless neither the "Emacs.EmacsFrame" resource nor the |
| 61 | "Emacs.EmacsFrame" resource is set; the frame | 59 | "Emacs.EmacsFrame" resource is set; the frame |