merge 3.5

This commit is contained in:
Benjamin Peterson 2016-06-13 23:43:40 -07:00
commit c09087680e
2 changed files with 4 additions and 4 deletions

View File

@ -2,6 +2,8 @@
See the file COPYING for copying permission.
*/
#include <stddef.h>
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
@ -16,8 +18,6 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h"
#include "internal.h"
#include "xmlrole.h"

View File

@ -2,6 +2,8 @@
See the file COPYING for copying permission.
*/
#include <stddef.h>
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
@ -16,8 +18,6 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h"
#include "internal.h"
#include "xmltok.h"