aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorPaul Eggert2011-08-04 19:19:34 -0700
committerPaul Eggert2011-08-04 19:19:34 -0700
commit0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3 (patch)
tree5f09676e1b87f3f274a60fe79728f84a3d0c9a9b /src/gmalloc.c
parent0065d05491ce5981ea20896bb26d21dcd31e6769 (diff)
parente504613cc63d2a3925c546177a04637e25a1a4ae (diff)
downloademacs-0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3.tar.gz
emacs-0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3.zip
Merge from trunk.
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index fa4aa1fdf6a..916bb300fe1 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -37,7 +37,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
37#include <config.h> 37#include <config.h>
38#endif 38#endif
39 39
40#ifdef HAVE_GTK_AND_PTHREAD 40#ifdef HAVE_PTHREAD
41#define USE_PTHREAD 41#define USE_PTHREAD
42#endif 42#endif
43 43