From 87ca4db73f41aea1008ee2c0dbe7e5594866510f Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 2 Oct 2023 05:27:40 -0400 Subject: [PATCH] Clean up private header. --- pdfio-private.h | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/pdfio-private.h b/pdfio-private.h index cc6bf63..0838c9a 100644 --- a/pdfio-private.h +++ b/pdfio-private.h @@ -1,7 +1,7 @@ // // Private header file for PDFio. // -// Copyright © 2021-2022 by Michael R Sweet. +// Copyright © 2021-2023 by Michael R Sweet. // // Licensed under Apache License v2.0. See the file "LICENSE" for more // information. @@ -10,18 +10,12 @@ #ifndef PDFIO_PRIVATE_H # define PDFIO_PRIVATE_H -// -// Include necessary headers... -// # ifdef _WIN32 -/* - * Disable bogus VS warnings/errors... - */ - -# define _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS // Disable bogus VS warnings/errors... # endif // _WIN32 + # include "pdfio.h" # include # include @@ -32,18 +26,7 @@ # ifdef _WIN32 # include # include - -/* - * Microsoft renames the POSIX functions to _name, and introduces - * a broken compatibility layer using the original names. As a result, - * random crashes can occur when, for example, strdup() allocates memory - * from a different heap than used by malloc() and free(). - * - * To avoid moronic problems like this, we #define the POSIX function - * names to the corresponding non-standard Microsoft names. - */ - -# define access _access +# define access _access // Map standard POSIX/C99 names # define close _close # define fileno _fileno # define lseek _lseek @@ -56,12 +39,7 @@ # define unlink _unlink # define vsnprintf _vsnprintf # define write _write - -/* - * Map various parameters for POSIX... - */ - -# define F_OK 00 +# define F_OK 00 // POSIX parameters/flags # define W_OK 02 # define R_OK 04 # define O_RDONLY _O_RDONLY @@ -71,7 +49,7 @@ # define O_BINARY _O_BINARY # else // !_WIN32 # include -# define O_BINARY 0 +# define O_BINARY 0 // Used on Windows for binary files... # endif // _WIN32 # include # include @@ -411,4 +389,5 @@ extern void _pdfioValueDelete(_pdfio_value_t *v) _PDFIO_INTERNAL; extern _pdfio_value_t *_pdfioValueRead(pdfio_file_t *pdf, pdfio_obj_t *obj, _pdfio_token_t *ts, _pdfio_value_t *v, size_t depth) _PDFIO_INTERNAL; extern bool _pdfioValueWrite(pdfio_file_t *pdf, pdfio_obj_t *obj, _pdfio_value_t *v, off_t *length) _PDFIO_INTERNAL; + #endif // !PDFIO_PRIVATE_H