Commit aa7e5fe0 authored by Ryan Jackson's avatar Ryan Jackson

Cleanup necessary for compiling the client code with recent versions of GCC (4.3.x).

If any of these changes break something, please fix it and let me know.
parent 6c6b2ee2
......@@ -8,6 +8,7 @@
#define __COMON_H
#include "port.h"
#include <cstring>
/*
* We have to do these includes differently depending on which version of gcc
......
......@@ -35,6 +35,7 @@ using namespace __gnu_cxx;
#endif
#include <string>
#include <cstring>
using namespace std;
class fstring {
......
......@@ -26,6 +26,7 @@
#include <map>
#include <string>
#include <iostream>
#include <cstring>
#define IPADDRFILE "/var/emulab/boot/myip"
......
......@@ -9,6 +9,8 @@
#ifndef SET_ITERATOR_H_DISTRIBUTED_DIJKSTRA_1
#define SET_ITERATOR_H_DISTRIBUTED_DIJKSTRA_1
#include <cstring>
template<class T>
class DefaultCompare
{
......
......@@ -12,6 +12,7 @@
#ifndef SINGLE_SOURCE_H_DISTRIBUTED_DIJKSTRA_1
#define SINGLE_SOURCE_H_DISTRIBUTED_DIJKSTRA_1
#include <climits>
#include <boost/config.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp>
......
......@@ -21,6 +21,7 @@
#ifndef VOTE_IP_TREE_H_DISTRIBUTED_DIJKSTRA_1
#define VOTE_IP_TREE_H_DISTRIBUTED_DIJKSTRA_1
#include <climits>
#include "bitmath.h"
#include "IpTree.h"
......
......@@ -16,6 +16,7 @@
#include "TreeCompressor.h"
#include "VoteIpTree.h"
#include "OptimalIpTree.h"
#include <cstring>
using namespace std;
......
......@@ -98,6 +98,8 @@
#include <grp.h>
#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
#include <time.h>
#include "suexec.h"
/*
......
......@@ -112,6 +112,8 @@ char *usagestr =
" -i Do not use SSL protocol\n"
"\n";
static int rewritecommand(char *, char *, char **);
void
usage()
{
......@@ -559,7 +561,6 @@ dotcp(char *data, int outfd, struct in_addr serverip)
}
if (strncmp(buf, "REDIRECT=", strlen("REDIRECT=")) == 0) {
struct hostent *he;
static int rewritecommand(char *, char *, char **);
redirectlimit--;
if (redirectlimit == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment