Commit 7b0d736c authored by Adrian Johnson's avatar Adrian Johnson

c++11 has <cstdint> so we can drop the stdint.h checks and emulation

parent 465edbbf
......@@ -15,7 +15,6 @@ check_include_files(dlfcn.h HAVE_DLFCN_H)
check_include_files(fcntl.h HAVE_FCNTL_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
check_include_files(memory.h HAVE_MEMORY_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdlib.h HAVE_STDLIB_H)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
......
......@@ -118,9 +118,6 @@
/* Use splash for rendering. */
#cmakedefine HAVE_SPLASH 1
/* Define to 1 if you have the <stdint.h> header file. */
#cmakedefine HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#cmakedefine HAVE_STDLIB_H 1
......
/*
* gtypes_p.h
*
* Some useful simple types.
*
* Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
*/
#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
......@@ -41,13 +41,13 @@
#pragma implementation
#endif
#include <cstdint>
#include <string.h>
#include <math.h>
#include <assert.h>
#include <cairo.h>
#include "goo/gfile.h"
#include "goo/gtypes_p.h"
#include "GlobalParams.h"
#include "Error.h"
#include "Object.h"
......
......@@ -45,13 +45,13 @@
#include <config.h>
#endif
#include <cstdint>
#include <stdint.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <math.h>
#include "goo/gmem.h"
#include "goo/gtypes_p.h"
#include "CairoRescaleBox.h"
......
......@@ -33,10 +33,10 @@
#pragma implementation
#endif
#include <cstdint>
#include <string.h>
#include "goo/gmem.h"
#include "goo/grandom.h"
#include "goo/gtypes_p.h"
#include "Decrypt.h"
#include "Error.h"
......
......@@ -10,10 +10,10 @@
//
//========================================================================
#include <cstdint>
#include <cairo.h>
#include "goo/gmem.h"
#include "goo/gtypes.h"
#include "goo/gtypes_p.h"
#include "goo/GooString.h"
#ifdef CAIRO_HAS_WIN32_SURFACE
......
......@@ -38,13 +38,13 @@
#include "config.h"
#include <poppler-config.h>
#include <cstdint>
#include <stdio.h>
#include <math.h>
#include <string.h>
#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