Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h: Include pcre.h #582

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

devurandom
Copy link

This fixes a compilation error with libpcre-8.42:

error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre'

Also remove inclusion of pcre.h from files already including COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h

Closes: #547
Closes: #570
Depends-On: #581

CRLF and LF were mixed in lots of files, confusing tools like `patch`.
This fixes a compilation error with libpcre-8.42:
```
error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre'
```

Closes: KhronosGroup#547
Closes: KhronosGroup#570
…ils/include/COLLADABUPcreCompiledPattern.h

In the previous commit COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
 was changed to already include this header.
@Fl4reBot
Copy link

FAILURE: exercise-opencollada-pull-request build #143

  • COLLADA-MAX-PC-PULL-REQUEST build #447 with result FAILURE.
  • COLLADA-MAYA-PC-PULL-REQUEST build #441 with result FAILURE.
  • Maya-2015_2017-mac-pull-request build #430 with result SUCCESS. Artifacts: Maya 2015 Maya 2016 Maya 2017
  • openCOLLADA-mac-pull-request build #440 with result FAILURE.
  • openCOLLADA-pc-pull-request build #436 with result FAILURE.
  • openCOLLADA-ubuntu-pull-request build #329 with result SUCCESS. Artifacts: OpenCOLLADA Ubuntu

Pull Requests:

@RemiArnaud
Copy link
Contributor

broken jenkins computer (HW failure)..

@RemiArnaud
Copy link
Contributor

RemiArnaud commented Jul 17, 2018

I relaunched the build, but this is not a Jenkins issue only.
those changes break the build everywhere

for example:

on windows:
e:\git\workspace\collada-max-pc-pull-request\colladabaseutils\include\COLLADABUPcreCompiledPattern.h(16): fatal error C1083: Cannot open include file: 'pcre.h': No such file or directory [e:\git\workspace\COLLADA-MAX-PC-PULL-REQUEST\COLLADAFramework\scripts\COLLADAFramework.vcxproj]

on mac:
openCOLLADA-mac-pull-request/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h:16:10: fatal error: 'pcre.h' file not found
#include <pcre.h>

@Fl4reBot
Copy link

FAILURE: exercise-opencollada-pull-request build #150

  • COLLADA-MAX-PC-PULL-REQUEST build #453 with result FAILURE.
  • COLLADA-MAYA-PC-PULL-REQUEST build #448 with result FAILURE.
  • Maya-2015_2017-mac-pull-request build #437 with result SUCCESS. Artifacts: Maya 2015 Maya 2016 Maya 2017
  • openCOLLADA-mac-pull-request build #447 with result FAILURE.
  • openCOLLADA-pc-pull-request build #442 with result FAILURE.
  • openCOLLADA-ubuntu-pull-request build #336 with result SUCCESS. Artifacts: OpenCOLLADA Ubuntu

Pull Requests:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre' PCRE error
3 participants