[mw-devel] MW3 r1293 - in trunk/src: . server webclient
welshbyte at sucs.org
welshbyte at sucs.org
Sun Nov 18 17:12:08 GMT 2012
Author: welshbyte
Date: 2012-11-18 17:12:08 +0000 (Sun, 18 Nov 2012)
New Revision: 1293
Modified:
trunk/src/Parse.c
trunk/src/add.c
trunk/src/alarm.c
trunk/src/alarm.h
trunk/src/bb.h
trunk/src/chattable.c
trunk/src/chattable.h
trunk/src/colour.c
trunk/src/command.c
trunk/src/completion.c
trunk/src/edit.c
trunk/src/files.c
trunk/src/files.h
trunk/src/folders.c
trunk/src/frl.c
trunk/src/iconv.c
trunk/src/incoming.c
trunk/src/init.c
trunk/src/ipc.c
trunk/src/js.c
trunk/src/log.c
trunk/src/main.c
trunk/src/mesg.c
trunk/src/mesg.h
trunk/src/new.c
trunk/src/newmain.c
trunk/src/read.h
trunk/src/rooms.c
trunk/src/script.c
trunk/src/script_inst.c
trunk/src/script_inst.h
trunk/src/server/Makefile
trunk/src/server/mwserv.c
trunk/src/socket.c
trunk/src/socket.h
trunk/src/special.c
trunk/src/sqlite.c
trunk/src/strings.c
trunk/src/talker.c
trunk/src/talker_privs.c
trunk/src/uri.c
trunk/src/user.c
trunk/src/webclient/Makefile
trunk/src/who.c
Log:
Remove a bunch of unnecessary includes and remove --std=c99 from server/Makefile and webclient/Makefile since --std=gnu99 is already there.
Modified: trunk/src/Parse.c
===================================================================
--- trunk/src/Parse.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/Parse.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -2,14 +2,11 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <unistd.h>
#include "bb.h"
#include "init.h"
#include "talker.h"
#include "strings.h"
-#include "user.h"
-#include "Parse.h"
#include "talker_privs.h"
extern unsigned long rights;
extern CommandList table[];
@@ -21,7 +18,6 @@
extern Alias alias_list;
extern Alias bind_list;
-#include "script.h"
static void shuffle_up(char *bp)
{
Modified: trunk/src/add.c
===================================================================
--- trunk/src/add.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/add.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -10,15 +10,14 @@
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
+#include <unistd.h>
#include <sys/wait.h>
#include <time.h>
#include "files.h"
-#include "bb.h"
#include "alarm.h"
#include "strings.h"
#include "perms.h"
#include "read.h"
-#include "user.h"
#include "main.h"
#include "init.h"
#include "mesg.h"
Modified: trunk/src/alarm.c
===================================================================
--- trunk/src/alarm.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/alarm.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,6 +1,10 @@
+#include <stdio.h>
#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <errno.h>
#include "alarm.h"
-#include <stdio.h>
struct alarm *volatile first_alarm, *volatile next_alarm;
static const struct timeval zero_time = {0, 0};
static int alarm_enabled = 0;
Modified: trunk/src/alarm.h
===================================================================
--- trunk/src/alarm.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/alarm.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,12 +1,7 @@
#ifndef ALARM_H
#define ALARM_H
-#include <sys/time.h>
-#include <sys/types.h>
-#include <signal.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
struct alarm
{
Modified: trunk/src/bb.h
===================================================================
--- trunk/src/bb.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/bb.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -5,7 +5,6 @@
* Miscellaneous structures/constants.
*/
-#include <stdint.h>
#ifndef HOMEPATH
#define HOMEPATH "/usr/local/lib/mw"
Modified: trunk/src/chattable.c
===================================================================
--- trunk/src/chattable.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/chattable.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,6 +1,5 @@
#include <stdlib.h>
-#include "Parse.h"
-#include "chattable.h"
+#include "talker.h"
/* command string table, whilst in talker mode */
/* "command", perms, #args, usage, descr, function, showable */
Modified: trunk/src/chattable.h
===================================================================
--- trunk/src/chattable.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/chattable.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,7 +1,6 @@
#ifndef CHATTABLE_H
#define CHATTABLE_H
-#include "talker.h"
#include "Parse.h"
/* command string table, whilst in talker mode */
Modified: trunk/src/colour.c
===================================================================
--- trunk/src/colour.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/colour.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -13,7 +13,6 @@
#include <errno.h>
#include "bb.h"
#include "frl.h"
-#include "user.h"
#include "colour.h"
#define COLOUR_LIMIT 40
Modified: trunk/src/command.c
===================================================================
--- trunk/src/command.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/command.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,6 +1,4 @@
#include <stdlib.h>
-#include "command.h"
-#include "Parse.h"
#include "talker.h"
/*
Modified: trunk/src/completion.c
===================================================================
--- trunk/src/completion.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/completion.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,5 +1,3 @@
-#include <unistd.h>
-#include "completion.h"
#include "script.h"
#include "uri.h"
#include "main.h"
Modified: trunk/src/edit.c
===================================================================
--- trunk/src/edit.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/edit.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -6,7 +6,6 @@
#include <stdio.h>
#include <inttypes.h>
#include <fcntl.h>
-#include <signal.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
@@ -18,16 +17,13 @@
#include <stdbool.h>
#include "talker_privs.h"
#include "special.h"
-#include "rooms.h"
#include "incoming.h"
#include "ipc.h"
#include "files.h"
#include "strings.h"
#include "perms.h"
#include "mesg.h"
-#include "user.h"
#include "getpass.h"
-#include "who.h"
#include "edit.h"
#include "init.h"
#include "read.h"
Modified: trunk/src/files.c
===================================================================
--- trunk/src/files.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/files.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -12,12 +12,8 @@
#include <sys/file.h>
#include <string.h>
#include <errno.h>
-#include <stdbool.h>
#include "strings.h"
-#include "user.h"
-#include "perms.h"
#include "files.h"
-#include "who.h"
#include "ipc.h"
#define MAXPIPELENGTH 2048
Modified: trunk/src/files.h
===================================================================
--- trunk/src/files.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/files.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,8 +1,6 @@
#ifndef FILES_H
#define FILES_H
-#include <stdint.h>
-#include <unistd.h>
#include "folders.h"
#include "user.h"
Modified: trunk/src/folders.c
===================================================================
--- trunk/src/folders.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/folders.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -7,17 +7,12 @@
#include <fcntl.h>
#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <stdbool.h>
#include "ipc.h"
#include "files.h"
#include "strings.h"
#include "perms.h"
-#include "folders.h"
-#include "user.h"
#include "intl.h"
void add_folder(void)
Modified: trunk/src/frl.c
===================================================================
--- trunk/src/frl.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/frl.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -8,10 +8,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
#include <ctype.h>
#include "frl.h"
-#include "strings.h"
#define READBLOCK 255
Modified: trunk/src/iconv.c
===================================================================
--- trunk/src/iconv.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/iconv.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,4 +1,3 @@
-#include <wchar.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
Modified: trunk/src/incoming.c
===================================================================
--- trunk/src/incoming.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/incoming.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -4,7 +4,6 @@
* see licence for furthur information. *
*********************************************************/
-#include <fcntl.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -14,17 +13,13 @@
#include "incoming.h"
#include "main.h"
#include "talker_privs.h"
+#include "talker.h"
#include "special.h"
-#include "chattable.h"
-#include "strings.h"
#include "rooms.h"
#include "alias.h"
#include "script.h"
#include "ipc.h"
#include "perms.h"
-#include "who.h"
-#include "user.h"
-#include "files.h"
#include "mesg.h"
#include "echo.h"
#include "intl.h"
Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/init.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -10,7 +10,6 @@
#include <sys/types.h>
#include <string.h>
#include <errno.h>
-#include <unistd.h>
#include "bb.h"
#include "intl.h"
#include "alias.h"
@@ -30,7 +29,6 @@
#include "script.h"
#include "frl.h"
-#include "user.h"
extern struct person *user;
Modified: trunk/src/ipc.c
===================================================================
--- trunk/src/ipc.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/ipc.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,17 +1,13 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
-#include <errno.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include "ipc.h"
#include "iconv.h"
-#include "talker.h"
#include "mesg.h"
-#include "who.h"
#include "files.h"
#include "socket.h"
#include "strings.h"
Modified: trunk/src/js.c
===================================================================
--- trunk/src/js.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/js.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -3,13 +3,10 @@
#define XP_UNIX
#include <fcntl.h>
-#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
-#include <jsapi.h>
-#include <iconv.h>
#include <sys/types.h>
+#include <unistd.h>
#include <pwd.h>
#include <readline/readline.h>
#include <curl/curl.h>
@@ -21,13 +18,13 @@
#include "chattable.h"
#include "script.h"
#include "talker_privs.h"
+#include "talker.h"
#include "iconv.h"
#include "alias.h"
#include "alarm.h"
#include "log.h"
#include "main.h"
#include "files.h"
-#include "user.h"
#include "init.h"
#include "who.h"
#include "js.h"
Modified: trunk/src/log.c
===================================================================
--- trunk/src/log.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/log.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,12 +1,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <signal.h>
#include <string.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <arpa/telnet.h>
-#include <ctype.h>
-#include <termcap.h>
#include <sys/types.h>
#include <regex.h>
#include <pthread.h>
@@ -15,20 +9,10 @@
#include <curl/curl.h>
#include "bb.h"
-#include "Parse.h"
-#include "talker_privs.h"
-#include "special.h"
-#include "talker.h"
-#include "gags.h"
#include "strings.h"
-#include "special.h"
-#include "script.h"
#include "js.h"
-#include "files.h"
#include "log.h"
#include "uri.h"
-#include "rooms.h"
-#include "ipc.h"
#include "sqlite.h"
extern int busy; /* if true dont display messages i.e. during new/write */
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/main.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -4,22 +4,14 @@
* see licence for furthur information. *
*********************************************************/
-#include <stdio.h>
-#include <signal.h>
#include <fcntl.h>
#include <errno.h>
#include <termios.h>
#include <sys/wait.h>
-#include <sys/stat.h>
-#include <arpa/telnet.h>
#include <stdarg.h>
#include <termcap.h>
-#include <wchar.h>
-#include <wctype.h>
#include <stdbool.h>
-#include "bb.h"
-#include "Parse.h"
#include "command.h"
#include "alarm.h"
#include "strings.h"
@@ -31,8 +23,6 @@
#include <readline/readline.h>
#include <readline/history.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include "talker_privs.h"
@@ -48,9 +38,7 @@
#include "js.h"
#include "mesg.h"
#include "main.h"
-#include "user.h"
#include "new.h"
-#include "who.h"
#include "echo.h"
#include "add.h"
#include "colour.h"
@@ -58,8 +46,6 @@
#include "intl.h"
#include "ipc.h"
-#include <pwd.h>
-#include <grp.h>
extern struct room myroom;
Modified: trunk/src/mesg.c
===================================================================
--- trunk/src/mesg.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/mesg.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,16 +1,11 @@
-#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <signal.h>
#include <string.h>
#include <stdarg.h>
-#include "bb.h"
#include "talker_privs.h"
#include "special.h"
#include "ipc.h"
-#include "user.h"
#include "perms.h"
#include "files.h"
#include "intl.h"
Modified: trunk/src/mesg.h
===================================================================
--- trunk/src/mesg.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/mesg.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,7 +1,6 @@
#ifndef MESG_H
#define MESG_H
-#include "user.h"
#include "folders.h"
#include "bb.h"
Modified: trunk/src/new.c
===================================================================
--- trunk/src/new.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/new.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -9,6 +9,7 @@
#include <string.h>
#include <time.h>
#include <stdbool.h>
+#include <unistd.h>
#include "alarm.h"
#include "incoming.h"
#include "strings.h"
Modified: trunk/src/newmain.c
===================================================================
--- trunk/src/newmain.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/newmain.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,29 +1,21 @@
#include <stdio.h>
#include <stdlib.h>
-#include <signal.h>
#include <fcntl.h>
#include <string.h>
#include <sys/wait.h>
-#include <arpa/telnet.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <unistd.h>
-#include <string.h>
#include <time.h>
#include <stdbool.h>
-#include <locale.h>
-#include "Parse.h"
#include "iconv.h"
#include "strings.h"
-#include "edit.h"
#include "main.h"
#include "perms.h"
#include "files.h"
-#include "folders.h"
#include "new.h"
-#include "user.h"
#include "read.h"
#include "edit.h"
#include "colour.h"
@@ -36,7 +28,6 @@
#include "talker.h"
#include "talker_privs.h"
#include "special.h"
-#include "ipc.h"
#include "log.h"
#include "intl.h"
#include "sort.h"
Modified: trunk/src/read.h
===================================================================
--- trunk/src/read.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/read.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,7 +1,6 @@
#ifndef READ_H
#define READ_H
-#include "user.h"
#include "folders.h"
#include "bb.h"
Modified: trunk/src/rooms.c
===================================================================
--- trunk/src/rooms.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/rooms.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,19 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <regex.h>
#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <readline/readline.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
#include "talker_privs.h"
#include "talker.h"
-#include "special.h"
-#include "frl.h"
-#include "strings.h"
-#include "ipc.h"
#include "sqlite.h"
#include "user.h"
#include "main.h"
@@ -23,7 +12,6 @@
extern unsigned long rights;
#define MAX_ARGC 128
-#include "Parse.h"
extern CommandList chattable[];
extern struct person *user;
extern long userposn;
Modified: trunk/src/script.c
===================================================================
--- trunk/src/script.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/script.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,30 +1,22 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
-#include <regex.h>
#include <string.h>
-#include <ctype.h>
#include <unistd.h>
#include <readline/readline.h>
-#include <fcntl.h>
-#include <time.h>
#include <pwd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <stdbool.h>
#include "bb.h"
#include "talker_privs.h"
-#include "rooms.h"
-#include "alarm.h"
#include "strings.h"
#include "expand.h"
#include "talker.h"
#include "init.h"
-#include "user.h"
#include "alias.h"
#include "script_inst.h"
#include "main.h"
-#include "Parse.h"
#include "frl.h"
#include "js.h"
Modified: trunk/src/script_inst.c
===================================================================
--- trunk/src/script_inst.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/script_inst.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,17 +1,16 @@
#include <fcntl.h>
-#include <signal.h>
#include <regex.h>
#include <time.h>
-#include <stdarg.h>
#include <string.h>
#include <ctype.h>
#include <stdio.h>
#include <readline/readline.h>
+#include <sys/time.h>
#include "script_inst.h"
#include "bb.h"
#include "incoming.h"
-#include "Parse.h"
#include "talker_privs.h"
+#include "talker.h"
#include "special.h"
#include "command.h"
#include "chattable.h"
Modified: trunk/src/script_inst.h
===================================================================
--- trunk/src/script_inst.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/script_inst.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,7 +1,6 @@
#ifndef SCRIPT_INST_H
#define SCRIPT_INST_H
-#include <stdio.h>
#include "script.h"
/*** Instruction set for the scripting language */
Modified: trunk/src/server/Makefile
===================================================================
--- trunk/src/server/Makefile 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/server/Makefile 2012-11-18 17:12:08 UTC (rev 1293)
@@ -24,7 +24,7 @@
### uncomment for gdb debugging
LDFLAGS+= -ggdb -g -lcrypt -lpq -ljansson
-CFLAGS+= -ggdb -g -D__NO_STRING_INLINE -fstack-protector-all -std=c99
+CFLAGS+= -ggdb -g -D__NO_STRING_INLINE -fstack-protector-all
### Optimisation - uncomment for release & extra testing
#CFLAGS+=-O3
Modified: trunk/src/server/mwserv.c
===================================================================
--- trunk/src/server/mwserv.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/server/mwserv.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <getopt.h>
#include <errno.h>
+#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#include <inttypes.h>
Modified: trunk/src/socket.c
===================================================================
--- trunk/src/socket.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/socket.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,13 +1,11 @@
-#include <features.h>
#include <stdio.h>
-#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <unistd.h>
#include <sys/socket.h>
#include <netdb.h>
#include <errno.h>
-#include <jansson.h>
#include "socket.h"
Modified: trunk/src/socket.h
===================================================================
--- trunk/src/socket.h 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/socket.h 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,7 +1,6 @@
#ifndef SOCKET_H
#define SOCKET_H
-#include <unistd.h>
#include <stdint.h>
#include <jansson.h>
#include "list.h"
Modified: trunk/src/special.c
===================================================================
--- trunk/src/special.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/special.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -4,7 +4,6 @@
* see licence for furthur information. *
*********************************************************/
-#include <stdio.h>
#include <string.h>
#include "special.h"
Modified: trunk/src/sqlite.c
===================================================================
--- trunk/src/sqlite.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/sqlite.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include "sqlite.h"
Modified: trunk/src/strings.c
===================================================================
--- trunk/src/strings.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/strings.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -3,8 +3,6 @@
#include <fcntl.h>
#include <ctype.h>
#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
#include <arpa/telnet.h>
#include <errno.h>
#include <stdarg.h>
Modified: trunk/src/talker.c
===================================================================
--- trunk/src/talker.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/talker.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -1,39 +1,29 @@
#include <unistd.h>
#include <stdio.h>
-#include <signal.h>
#include <string.h>
#include <fcntl.h>
-#include <sys/wait.h>
-#include <arpa/telnet.h>
-#include <ctype.h>
#include <termcap.h>
#include <sys/types.h>
-#include <regex.h>
-#include <sqlite3.h>
#include <stdbool.h>
#include "bb.h"
-#include "Parse.h"
#include "talker_privs.h"
#include "special.h"
#include "talker.h"
#include "gags.h"
#include "strings.h"
#include "special.h"
-#include "script.h"
#include "script_inst.h"
#include "js.h"
#include "files.h"
#include "sqlite.h"
#include "perms.h"
-#include "who.h"
#include "main.h"
#include "init.h"
#include "echo.h"
#include "rooms.h"
#include "ipc.h"
#include "log.h"
-#include "user.h"
#include "uri.h"
#include "util.h"
#include "intl.h"
Modified: trunk/src/talker_privs.c
===================================================================
--- trunk/src/talker_privs.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/talker_privs.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -7,7 +7,6 @@
#include "rooms.h"
#include "gags.h"
#include "main.h"
-#include "user.h"
#define false 0
#define true !false
Modified: trunk/src/uri.c
===================================================================
--- trunk/src/uri.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/uri.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -4,8 +4,6 @@
#include <sqlite3.h>
#include <readline/readline.h>
-#include "bb.h"
-#include "user.h"
#include "uri.h"
#include "sqlite.h"
#include "talker.h"
Modified: trunk/src/user.c
===================================================================
--- trunk/src/user.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/user.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -9,7 +9,6 @@
#include <ctype.h>
#include <string.h>
#include <unistd.h>
-#include <stdlib.h>
#include <pwd.h>
#include <time.h>
#include <stdbool.h>
@@ -18,7 +17,6 @@
#include "talker.h"
#include "files.h"
#include "strings.h"
-#include "user.h"
#include "getpass.h"
#include "perms.h"
#include "mesg.h"
Modified: trunk/src/webclient/Makefile
===================================================================
--- trunk/src/webclient/Makefile 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/webclient/Makefile 2012-11-18 17:12:08 UTC (rev 1293)
@@ -24,7 +24,7 @@
### uncomment for gdb debugging
LDFLAGS+= -ggdb -g -lcrypt -lpq -ljansson
-CFLAGS+= -ggdb -g -D__NO_STRING_INLINE -fstack-protector-all -std=c99
+CFLAGS+= -ggdb -g -D__NO_STRING_INLINE -fstack-protector-all
### Optimisation - uncomment for release & extra testing
#CFLAGS+=-O3
Modified: trunk/src/who.c
===================================================================
--- trunk/src/who.c 2012-11-18 03:17:57 UTC (rev 1292)
+++ trunk/src/who.c 2012-11-18 17:12:08 UTC (rev 1293)
@@ -5,9 +5,7 @@
*********************************************************/
#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <errno.h>
#include <signal.h>
#include <string.h>
#include <fcntl.h>
@@ -16,12 +14,10 @@
#include "talker_privs.h"
#include "special.h"
-#include "rooms.h"
#include "strings.h"
#include "ipc.h"
#include "files.h"
#include "perms.h"
-#include "who.h"
#include "talker.h"
extern int busy;
More information about the mw-devel
mailing list