summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2011-05-16 17:44:51 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2011-05-16 17:44:51 +0800
commit23ac9e61a66258fdf5c52671b243c4044fd8824e (patch)
tree7163737d21ac41b52f5a615fa866eeb7f9d0e3e2
parentae9013c6a598eb589449bac0fedda58a624f9240 (diff)
downloadpango-23ac9e61a66258fdf5c52671b243c4044fd8824e.tar.gz
Update preconfigured config.h(.win32.in)
-Update for Visual C++ 2010 regarding stdint.h (it is shipped with VS 2010 by default) -Allow option to not use FontConfig
-rw-r--r--config.h.win32.in10
1 files changed, 8 insertions, 2 deletions
diff --git a/config.h.win32.in b/config.h.win32.in
index 1864ad04..211d96cd 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -9,7 +9,9 @@
/* #undef HAVE_CAIRO_ATSUI */
/* Whether Cairo can use FreeType for fonts */
+#ifndef PANGO_VISUALC_NO_FC
#define HAVE_CAIRO_FREETYPE 1
+#endif
/* Whether Cairo has PDF support */
#define HAVE_CAIRO_PDF 1
@@ -37,7 +39,9 @@
/* #undef HAVE_FLOCKFILE */
/* Have FreeType 2 library */
+#ifndef PANGO_VISUALC_NO_FC
#define HAVE_FREETYPE 1
+#endif
/* Define to 1 if you have the `getpagesize' function. */
/* #undef HAVE_GETPAGESIZE */
@@ -55,7 +59,9 @@
/* #undef HAVE_NDIR_H */
/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
+#if (_MSC_VER >= 1600)
+#define HAVE_STDINT_H 1
+#endif
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
@@ -148,4 +154,4 @@
#define VERSION "@PANGO_VERSION@"
/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
+#define X_DISPLAY_MISSING 1