Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 220783 | Differences between
and this patch

Collapse All | Expand All

(-)./src/coolkey/slot.cpp.coolkey-gcc43 (-2 lines)
Lines 25-31 Link Here
25
#include "PKCS11Exception.h"
25
#include "PKCS11Exception.h"
26
#include <winscard.h>
26
#include <winscard.h>
27
#include "slot.h"
27
#include "slot.h"
28
#include <memory.h>
29
#include "zlib.h"
28
#include "zlib.h"
30
#include "params.h"
29
#include "params.h"
31
30
Lines 33-39 Link Here
33
32
34
#define MIN(x, y) ((x) < (y) ? (x) : (y))
33
#define MIN(x, y) ((x) < (y) ? (x) : (y))
35
34
36
using std::auto_ptr;
37
35
38
36
39
#ifdef DEBUG
37
#ifdef DEBUG
(-)./src/coolkey/machdep.cpp.coolkey-gcc43 (+2 lines)
Lines 33-38 Link Here
33
#include <sys/stat.h>
33
#include <sys/stat.h>
34
#include <sys/mman.h>
34
#include <sys/mman.h>
35
#include <pthread.h>
35
#include <pthread.h>
36
#include <string.h>
37
#include <stdlib.h>
36
#endif
38
#endif
37
39
38
#ifdef _WIN32
40
#ifdef _WIN32
(-)./src/coolkey/log.cpp.coolkey-gcc43 (+2 lines)
Lines 18-23 Link Here
18
 * ***** END COPYRIGHT BLOCK *****/
18
 * ***** END COPYRIGHT BLOCK *****/
19
19
20
#include <string>
20
#include <string>
21
#include <string.h>
22
#include <stdlib.h>
21
#include "mypkcs11.h"
23
#include "mypkcs11.h"
22
#include <assert.h>
24
#include <assert.h>
23
#include <stdio.h>
25
#include <stdio.h>
(-)./src/coolkey/object.cpp.coolkey-gcc43 (+1 lines)
Lines 21-26 Link Here
21
#include "PKCS11Exception.h"
21
#include "PKCS11Exception.h"
22
#include "object.h"
22
#include "object.h"
23
#include <algorithm>
23
#include <algorithm>
24
#include <string.h>
24
25
25
using std::find_if;
26
using std::find_if;
26
27

Return to bug 220783