[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / backend / dvi / mdvi-lib / private.h

diff --git a/backend/dvi/mdvi-lib/private.h b/backend/dvi/mdvi-lib/private.h
index c547cd2d639e3955bea015918962021d5f4a7da7..9f89dc708cedfaa817a186c7413c2e2111dbce50 100644 (file)
--- a/backend/dvi/mdvi-lib/private.h
+++ b/backend/dvi/mdvi-lib/private.h
@@ -13,12 +13,25 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #ifndef _MDVI_PRIVATE_H
 #define _MDVI_PRIVATE_H 1
 
 #define HAVE_PROTOTYPES 1
+
+#if STDC_HEADERS
+#  /* kpathsea's headers (wrongly!) redefine strchr() and strrchr() to
+#     non ANSI C functions if HAVE_STRCHR and HAVE_STRRCHR are not defined.
+#   */
+#  ifndef HAVE_STRCHR
+#     define HAVE_STRCHR
+#   endif
+#  ifndef HAVE_STRRCHR
+#    define HAVE_STRRCHR
+#  endif
+#endif
+
 #include <kpathsea/debug.h>
 #include <kpathsea/tex-file.h>
 #include <kpathsea/tex-glyph.h>
@@ -26,6 +39,7 @@
 #include <kpathsea/proginit.h>
 #include <kpathsea/progname.h>
 #include <kpathsea/tex-make.h>
+#include <kpathsea/lib.h>
 
 #define ISSP(p)                (*(p) == ' ' || *(p) == '\t')
 #define SKIPSP(p)      while(ISSP(p)) p++