diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /src/gmalloc.c | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 8314798b171..5237432872d 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -72,9 +72,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. | |||
| 72 | #define CHAR_BIT 8 | 72 | #define CHAR_BIT 8 |
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | #ifdef HAVE_UNISTD_H | ||
| 76 | #include <unistd.h> | 75 | #include <unistd.h> |
| 77 | #endif | ||
| 78 | 76 | ||
| 79 | #ifdef USE_PTHREAD | 77 | #ifdef USE_PTHREAD |
| 80 | #include <pthread.h> | 78 | #include <pthread.h> |
| @@ -2173,5 +2171,3 @@ mprobe (__ptr_t ptr) | |||
| 2173 | 2171 | ||
| 2174 | #endif /* GC_MCHECK */ | 2172 | #endif /* GC_MCHECK */ |
| 2175 | 2173 | ||
| 2176 | /* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e | ||
| 2177 | (do not change this comment) */ | ||