diff options
| author | Dan Nicolaescu | 2010-07-12 11:16:54 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-12 11:16:54 -0700 |
| commit | 5dddb7a8b16f6d4ccad4edee93f5ea944cdd9337 (patch) | |
| tree | ea8f180f204fec159db4d365d8407290c5e5adf8 | |
| parent | e9952282f866b1d2cc4c92137c9a21fdc2b44e2a (diff) | |
| download | emacs-5dddb7a8b16f6d4ccad4edee93f5ea944cdd9337.tar.gz emacs-5dddb7a8b16f6d4ccad4edee93f5ea944cdd9337.zip | |
* nt/config.nt (volatile): Remove definition.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/config.nt | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 1b82d320e3a..6e6ed00696d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * config.nt (volatile): Remove definition. | ||
| 4 | |||
| 1 | 2010-07-07 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2010-07-07 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs. | 7 | * config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs. |
diff --git a/nt/config.nt b/nt/config.nt index a5d2ff994ed..683070f1063 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -349,13 +349,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 349 | 349 | ||
| 350 | #define my_strftime nstrftime /* for strftime.c */ | 350 | #define my_strftime nstrftime /* for strftime.c */ |
| 351 | 351 | ||
| 352 | /* Non-ANSI C compilers usually don't have volatile. */ | ||
| 353 | #ifndef HAVE_VOLATILE | ||
| 354 | #ifndef __STDC__ | ||
| 355 | #define volatile | ||
| 356 | #endif | ||
| 357 | #endif | ||
| 358 | |||
| 359 | #ifndef WINDOWSNT | 352 | #ifndef WINDOWSNT |
| 360 | /* Some of the files of Emacs which are intended for use with other | 353 | /* Some of the files of Emacs which are intended for use with other |
| 361 | programs assume that if you have a config.h file, you must declare | 354 | programs assume that if you have a config.h file, you must declare |