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

pfring: update PfringThreadVars_ for gcc 4.x #3769

Closed

Conversation

jmtaylor90
Copy link
Contributor

Signed-off-by: jason taylor jtfas90@gmail.com

Make sure these boxes are signed before submitting your Pull Request -- thank you.

Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/2899

Describe changes:

  • In the 4.4.7 version of gcc on el6 there is stricter checking via -pedantic than newer versions. This change removes the duplicate typedef keyword and relies on the definition in the header file.

PRScript output (if applicable):

Signed-off-by: jason taylor <jtfas90@gmail.com>
@jmtaylor90 jmtaylor90 requested a review from a team as a code owner April 3, 2019 12:18
@victorjulien
Copy link
Member

As PfringThreadVars are only used in source-pfring.c I would like to suggest removing the typedef from source-pfring.h instead.

@jmtaylor90
Copy link
Contributor Author

jmtaylor90 commented Apr 3, 2019

As PfringThreadVars are only used in source-pfring.c I would like to suggest removing the typedef from source-pfring.h instead.

What about the PfringPacketVars_ struct in src/source-pfring.h?

typedef struct PfringPacketVars_
{
    PfringThreadVars *ptv;
    uint32_t flow_id;
} PfringPacketVars;

@victorjulien
Copy link
Member

Ah I missed that, sorry.

@victorjulien victorjulien mentioned this pull request Apr 8, 2019
@victorjulien
Copy link
Member

Merged through #3783, thanks Jason!

@jmtaylor90 jmtaylor90 deleted the pfring-gcc-struct-fix-2899-v1 branch April 8, 2019 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants