23 lines
866 B
Diff
23 lines
866 B
Diff
|
https://bugzilla.redhat.com/show_bug.cgi?id=356971
|
||
|
|
coolkey.cpp:37:1: error: "NULL" redefined
|
||
|
|
In file included from /usr/include/alloca.h:25,
|
||
|
|
from /usr/include/stdlib.h:612,
|
||
|
|
from /usr/include/c++/4.3.0/cstdlib:73,
|
||
|
|
from /usr/include/c++/4.3.0/bits/stl_algo.h:65,
|
||
|
|
from /usr/include/c++/4.3.0/algorithm:67,
|
||
|
|
from slot.h:27,
|
||
|
|
from coolkey.cpp:33:
|
||
|
|
/usr/lib64/gcc/x86_64-suse-linux/4.3.0/include/stddef.h:400:1: error: this is the location of the previous definition
|
||
|
|
================================================================================
|
||
|
|
--- src/coolkey/coolkey.cpp
|
||
|
|
+++ src/coolkey/coolkey.cpp
|
||
|
|
@@ -34,8 +34,6 @@
|
||
|
|
#include "cky_base.h"
|
||
|
|
#include "params.h"
|
||
|
|
|
||
|
|
-#define NULL 0
|
||
|
|
-
|
||
|
|
/* static module data -------------------------------- */
|
||
|
|
|
||
|
|
static Log *log = NULL;
|