Compile fixes, warnings etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,7 +41,7 @@ SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
|
||||
|
||||
LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
|
||||
|
||||
LIB_C_ALL_SRC=$(LIB_C_SRC) @IOBC_C_SRC@ parser.c
|
||||
LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c
|
||||
|
||||
#define library objects
|
||||
LIB_OBJ=\
|
||||
|
@@ -124,7 +124,7 @@ arg1 : WORD
|
||||
|
||||
%%
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
||||
#include "lexer.c"
|
||||
#else
|
||||
#include "../common/lex_yy.c"
|
||||
|
@@ -352,14 +352,14 @@ kbList::iterator::operator*()
|
||||
kbList::iterator &
|
||||
kbList::iterator::operator++()
|
||||
{
|
||||
node = node ? node->next : NULL;
|
||||
node = node ? node->next : (kbListNode*)NULL;
|
||||
return *this;
|
||||
}
|
||||
|
||||
kbList::iterator &
|
||||
kbList::iterator::operator--()
|
||||
{
|
||||
node = node ? node->prev : NULL;
|
||||
node = node ? node->prev : (kbListNode*)NULL;
|
||||
return *this;
|
||||
}
|
||||
kbList::iterator &
|
||||
|
@@ -131,7 +131,8 @@ LIB_CPP_SRC=\
|
||||
generic/statusbr.cpp \
|
||||
generic/tabg.cpp \
|
||||
generic/textdlgg.cpp \
|
||||
generic/treectrl.cpp
|
||||
generic/treectrl.cpp \
|
||||
generic/helpext.cpp
|
||||
|
||||
LIB_C_SRC=\
|
||||
common/extended.c \
|
||||
|
@@ -39,6 +39,7 @@ LIB_CPP_SRC=\
|
||||
common/resource.cpp \
|
||||
common/serbase.cpp \
|
||||
common/string.cpp \
|
||||
common/tbarbase.cpp \
|
||||
common/textfile.cpp \
|
||||
common/time.cpp \
|
||||
common/timercmn.cpp \
|
||||
@@ -140,6 +141,9 @@ LIB_CPP_SRC=\
|
||||
generic/treectrl.cpp
|
||||
|
||||
LIB_C_SRC=\
|
||||
\
|
||||
motif/xmcombo/xmcombo.c \
|
||||
\
|
||||
common/extended.c \
|
||||
\
|
||||
png/png.c \
|
||||
|
Reference in New Issue
Block a user