diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /src/s | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index e89ecb05931..63fc2f1f62b 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -122,7 +122,6 @@ struct sigaction { | |||
| 122 | 122 | ||
| 123 | #define HAVE_GETTIMEOFDAY 1 | 123 | #define HAVE_GETTIMEOFDAY 1 |
| 124 | #define HAVE_GETHOSTNAME 1 | 124 | #define HAVE_GETHOSTNAME 1 |
| 125 | #undef HAVE_GETDOMAINNAME | ||
| 126 | #define HAVE_DUP2 1 | 125 | #define HAVE_DUP2 1 |
| 127 | #define HAVE_RENAME 1 | 126 | #define HAVE_RENAME 1 |
| 128 | #define HAVE_CLOSEDIR 1 | 127 | #define HAVE_CLOSEDIR 1 |
| @@ -147,7 +146,6 @@ struct sigaction { | |||
| 147 | #define HAVE_FMOD 1 | 146 | #define HAVE_FMOD 1 |
| 148 | #undef HAVE_RINT | 147 | #undef HAVE_RINT |
| 149 | #undef HAVE_CBRT | 148 | #undef HAVE_CBRT |
| 150 | #define HAVE_FTIME 1 | ||
| 151 | #undef HAVE_RES_INIT /* For -lresolv on Suns. */ | 149 | #undef HAVE_RES_INIT /* For -lresolv on Suns. */ |
| 152 | #undef HAVE_SETSID | 150 | #undef HAVE_SETSID |
| 153 | #undef HAVE_FPATHCONF | 151 | #undef HAVE_FPATHCONF |