blob: d4183bd8f75f1de00497bc3dbae2234a29317cc2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
--- ./h/Config.h.orig 2002-09-30 23:41:19.000000000 -0400
+++ ./h/Config.h 2002-09-30 23:41:53.000000000 -0400
@@ -94,7 +94,7 @@
String string_options[max_option];
- friend MUDSelection; // messes with mud_list
+ friend struct MUDSelection; // messes with mud_list
time_t save_time; // When was .mclrc last modifed?
--- ./h/Window.h.orig 2002-09-30 23:41:28.000000000 -0400
+++ ./h/Window.h 2002-09-30 23:42:01.000000000 -0400
@@ -82,7 +82,7 @@
virtual void set_bottom_message (const char *s);
- friend Group; // argh
+ friend struct Group; // argh
Window* find(Window *w); // Is this window still one of my children?
--- ./h/OutputWindow.h.orig 2002-09-30 23:41:33.000000000 -0400
+++ ./h/OutputWindow.h 2002-09-30 23:42:17.000000000 -0400
@@ -42,7 +42,7 @@
} highlight;
bool fFrozen; // Should we move viewpoint or not?
- friend ScrollbackController;
+ friend struct ScrollbackController;
};
// This is an invisible object that controls the scrollback process
--- ./h/Session.h.orig 2002-09-30 23:41:40.000000000 -0400
+++ ./h/Session.h 2002-09-30 23:42:29.000000000 -0400
@@ -52,9 +52,9 @@
mc_state *mcinfo;
ColorConverter colorConverter;
- friend NetworkStateWindow;
- friend StatWindow;
- friend TimerWindow;
+ friend struct NetworkStateWindow;
+ friend struct StatWindow;
+ friend struct TimerWindow;
void print(const char *s); // Write to our output/log
--- ./h/Chat.h.orig 2002-09-30 23:42:37.000000000 -0400
+++ ./h/Chat.h 2002-09-30 23:42:45.000000000 -0400
@@ -196,7 +196,7 @@
ChatServerSocket(); // bind to port
List<ChatConnection*> connections;
- friend ChatConnection;
+ friend struct ChatConnection;
int id; // Stamp ID
bool is_afk;
int snoop_count;
--- Makefile.orig 2002-09-30 23:53:50.000000000 -0400
+++ Makefile 2002-09-30 23:54:02.000000000 -0400
@@ -54,7 +54,7 @@
LOCAL_CPPFLAGS=-Ih
LOCAL_CXXFLAGS=-W -Wall -pipe
LOCAL_LDFLAGS=-rdynamic
-LOCAL_LIBS=
+LOCAL_LIBS=-lstdc++
# Common flags
MCL_CFLAGS=$(CFLAGS) $(CPPFLAGS) $(DEFS) $(LOCAL_CFLAGS) $(LOCAL_CPPFLAGS)
|
GitWeb
