diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
| commit | a0451a715e4ed018a02b825d0eb823424693d1de (patch) | |
| tree | d2b10fcc69c333ccc438d7a9ad116fbc1495fc9e /src/fileio.c | |
| parent | d324f894beea8b485792c779659e8e20c1cb699d (diff) | |
| parent | 12f7728e938fe5bb850ce2928637d1e349919142 (diff) | |
| download | emacs-a0451a715e4ed018a02b825d0eb823424693d1de.tar.gz emacs-a0451a715e4ed018a02b825d0eb823424693d1de.tar.bz2 emacs-a0451a715e4ed018a02b825d0eb823424693d1de.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c index 601c5b5de9d..1cd1188cb63 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3546,11 +3546,7 @@ Use the current time if TIME is nil. TIME is in the format of return Qt; } -#ifdef __NetBSD__ -#define unix 42 -#endif - -#ifdef unix +#ifdef HAVE_SYNC DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", doc: /* Tell Unix to finish all pending disk updates. */) () @@ -3559,7 +3555,7 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", return Qnil; } -#endif /* unix */ +#endif /* HAVE_SYNC */ DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0, doc: /* Return t if file FILE1 is newer than file FILE2. @@ -6709,7 +6705,7 @@ A non-nil value may result in data loss! */); defsubr (&Sread_file_name); defsubr (&Snext_read_file_uses_dialog_p); -#ifdef unix +#ifdef HAVE_SYNC defsubr (&Sunix_sync); #endif } |