Commit ade53277 authored by Albert Astals Cid's avatar Albert Astals Cid

Move HAVE_STDINT_H use to a private header

This way we do not need to expose it in poppler-config.h since gtypes.h is a half public header
parent 6166c3a3
......@@ -43,4 +43,5 @@ libgoo_la_SOURCES = \
JpegWriter.cc \
TiffWriter.cc \
ImgWriter.cc \
gtypes_p.h \
gstrtod.cc
......@@ -24,8 +24,6 @@
#ifndef GTYPES_H
#define GTYPES_H
#include "config.h"
/*
* These have stupid names to avoid conflicts with some (but not all)
* C++ compilers which define them.
......@@ -47,20 +45,4 @@ typedef unsigned short Gushort;
typedef unsigned int Guint;
typedef unsigned long Gulong;
/*
* Define precise integer types.
*/
#if HAVE_STDINT_H
#include <stdint.h>
#elif _MSC_VER
typedef signed __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef signed __int16 int16_t;
typedef unsigned __int16 uint16_t;
typedef signed __int32 int32_t;
typedef unsigned __int32 uint32_t;
typedef signed __int64 int64_t;
typedef unsigned __int64 uint64_t;
#endif
#endif
/*
* gtypes_p.h
*
* Some useful simple types.
*
* Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
*/
#ifndef GTYPES_P_H
#define GTYPES_P_H
#include "config.h"
/*
* Define precise integer types.
*/
#if HAVE_STDINT_H
#include <stdint.h>
#elif _MSC_VER
typedef signed __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef signed __int16 int16_t;
typedef unsigned __int16 uint16_t;
typedef signed __int32 int32_t;
typedef unsigned __int32 uint32_t;
typedef signed __int64 int64_t;
typedef unsigned __int64 uint64_t;
#endif
#endif
......@@ -44,6 +44,7 @@
#include <cairo.h>
#include "goo/gfile.h"
#include "goo/gtypes_p.h"
#include "GlobalParams.h"
#include "Error.h"
#include "Object.h"
......
......@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <math.h>
#include "goo/gmem.h"
#include "goo/gtypes_p.h"
#include "CairoRescaleBox.h"
......
......@@ -39,6 +39,7 @@
#include "parseargs.h"
#include "goo/gmem.h"
#include "goo/gtypes.h"
#include "goo/gtypes_p.h"
#include "goo/GooString.h"
#include "goo/ImgWriter.h"
#include "goo/JpegWriter.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment