Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 17:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

mingw makefile + more mingw compatibility fixes

Browse source 
svn path=/trunk/; revision=17445
This commit is contained in:
Royce Mitchell III 2005-08-19 21:53:40 +00:00
parent 999292611d
commit 07435bc9ca
2 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
irc/ArchBlackmann/ArchBlackmann.cpp
View file

@ -203,12 +203,13 @@ public:
} }
bool OnPart ( const std::string& user, const std::string& channel ) bool OnPart ( const std::string& user, const std::string& channel )
{ {
for ( int i = 0; i < ops.size(); i++ ) std::vector<std::string>::iterator it = ops.begin();
for ( ; it != ops.end(); it++ )
{ {
if ( ops[i] == user ) if ( *it == user )
{ {
printf ( "remove '%s' to ops list\n", user.c_str() ); printf ( "remove '%s' to ops list\n", user.c_str() );
ops.erase ( &ops[i] ); ops.erase ( it );
} }
} }
return true; return true;
@ -394,15 +395,17 @@ public:
return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) );
s = string ( p, p2-p ); s = string ( p, p2-p );
} }
for ( i = 0; i < list.list.size(); i++ ) std::vector<std::string>::iterator it = list.list.begin();
for ( ; it != list.list.end(); it++ )
{ {
if ( list.list[i] == s ) if ( *it == s )
{ {
list.list.erase ( &list.list[i] ); list.list.erase ( it );
{ {
File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
for ( i = 0; i < list.list.size(); i++ ) it = list.list.begin();
f.printf ( "%s\n", list.list[i].c_str() ); for ( ; it < list.list.end(); it++ )
f.printf ( "%s\n", it->c_str() );
} }
return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) ); return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) );
} }
@ -480,12 +483,13 @@ public:
{ {
if ( *p == 'o' ) if ( *p == 'o' )
{ {
for ( int i = 0; i < ops.size(); i++ ) std::vector<std::string>::iterator it = ops.begin();
for ( ; it != ops.end(); it++ )
{ {
if ( ops[i] == target ) if ( *it == target )
{ {
printf ( "remove '%s' to ops list\n", target.c_str() ); printf ( "remove '%s' to ops list\n", target.c_str() );
ops.erase ( &ops[i] ); ops.erase ( it );
} }
} }
break; break;

32
irc/ArchBlackmann/makefile Normal file
View file

@ -0,0 +1,32 @@
TARGET := ArchBlackmann.exe
.PHONY: all
all: $(TARGET)
CFLAGS := -DWIN32 -D_DEBUG -D_CONSOLE -D_MBCS
LFLAGS :=
LIBS := -lstdc++ -lws2_32
SRCS := ArchBlackmann.cpp \
base64.cpp \
chomp.cpp \
cram_md5.cpp \
File.cpp \
IRCClient.cpp \
MD5.cpp \
panic.cpp \
ReliMT.cpp \
SockUtils.cpp \
SplitJoin.cpp \
ssprintf.cpp \
ThreadPool.cpp \
trim.cpp
OBJS := $(SRCS:.cpp=.o)
$(TARGET): $(OBJS)
g++ $(LFLAGS) -o $@ $(OBJS) $(LIBS)
.cpp.o: $<
g++ $(CFLAGS) -c $< -o $@