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

Fixes link editing errors in msys / mingw64 #116

Merged
merged 1 commit into from
Jul 10, 2017
Merged

Conversation

sbrunel
Copy link
Contributor

@sbrunel sbrunel commented Jul 10, 2017

Can't compil on msys/mingw64

Error message:

build/temp.mingw-2.7/src/_csrc/bcrypt_pbkdf.o:bcrypt_pbkdf.c:(.text+0x0): multiple definition of `_abs64'
build/temp.mingw-2.7/src/_csrc/bcrypt.o:bcrypt.c:(.text+0x0): first defined here
collect2.exe: error: ld returned 1 exit status

Corrections:

In "src/_csrc/bcrypt_pbkdf.c", re-organize:

#include <sys/types.h>
#include <stdlib.h>
#include <string.h>

#include "pycabcrypt.h"
#include "blf.h"
#include "sha2.h"

In "src/_csrc/blf.h", move #include "pycabcrypt.h":

#ifndef BLF_H
#define BLF_H

#include "pycabcrypt.h"
...
#endif

In "src/_csrc/pycabcrypt.h", add :

#ifndef PYCABCRYPT
#define PYCABCRYPT
...
#endif

Copy link
Member

@reaperhulk reaperhulk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR!

@reaperhulk reaperhulk merged commit aa3f44d into pyca:master Jul 10, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 16, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants