Make net/netmap building on -current again
PR: ports/46267 Submitted by: Kuang-che Wu <kcwu@kcwu.dyndns.org>
This commit is contained in:
parent
d3a9a80ea4
commit
42f82ca6c0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=71745
12 changed files with 169 additions and 2 deletions
10
net/netmap/files/patch-belgolib::dirs.h
Normal file
10
net/netmap/files/patch-belgolib::dirs.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- belgolib/dirs.h.orig Sun Dec 15 14:54:27 2002
|
||||
+++ belgolib/dirs.h Sun Dec 15 14:54:27 2002
|
||||
@@ -3,6 +3,7 @@
|
||||
// - Consider using vector instead of list<T*>'s
|
||||
|
||||
#include <list>
|
||||
+using namespace std;
|
||||
|
||||
#ifndef __make_dep__
|
||||
#include <string>
|
10
net/netmap/files/patch-belgolib::dirs_core.c
Normal file
10
net/netmap/files/patch-belgolib::dirs_core.c
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- belgolib/dirs_core.c.orig Sun Dec 15 15:02:19 2002
|
||||
+++ belgolib/dirs_core.c Sun Dec 15 15:02:25 2002
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "dirs_core.h"
|
||||
|
||||
-Oinfo::Oinfo(const string& fname, int fmode=0)
|
||||
+Oinfo::Oinfo(const string& fname, int fmode)
|
||||
{
|
||||
stat_info = new struct stat;
|
||||
|
10
net/netmap/files/patch-belgolib::dirs_core.h
Normal file
10
net/netmap/files/patch-belgolib::dirs_core.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- belgolib/dirs_core.h.orig Wed Dec 19 07:46:22 2001
|
||||
+++ belgolib/dirs_core.h Sun Dec 15 15:01:06 2002
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#ifndef __make_dep__
|
||||
#include <string>
|
||||
+using namespace std;
|
||||
#endif
|
||||
|
||||
#ifndef __dirs_core_h__
|
28
net/netmap/files/patch-belgolib::files.c
Normal file
28
net/netmap/files/patch-belgolib::files.c
Normal file
|
@ -0,0 +1,28 @@
|
|||
--- belgolib/files.c.orig Sun Dec 15 14:54:27 2002
|
||||
+++ belgolib/files.c Sun Dec 15 14:54:27 2002
|
||||
@@ -1,6 +1,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
+#include <iostream>
|
||||
|
||||
#include "files.h"
|
||||
#include "debug.h"
|
||||
@@ -16,7 +17,7 @@
|
||||
|
||||
Infile::Infile() : ifstream() { }
|
||||
|
||||
-Infile::Infile(const string& file_name, int mode, bool fatal)
|
||||
+Infile::Infile(const string& file_name, ios::openmode mode, bool fatal)
|
||||
: ifstream(file_name.c_str(), mode)
|
||||
{
|
||||
|
||||
@@ -38,7 +39,7 @@
|
||||
}
|
||||
|
||||
|
||||
-int Infile::Open(const string & file_name, int mode, bool fatal)
|
||||
+int Infile::Open(const string & file_name, ios::openmode mode, bool fatal)
|
||||
{
|
||||
|
||||
if(cdb>d_list)
|
19
net/netmap/files/patch-belgolib::files.h
Normal file
19
net/netmap/files/patch-belgolib::files.h
Normal file
|
@ -0,0 +1,19 @@
|
|||
--- belgolib/files.h.orig Sun Dec 15 14:54:27 2002
|
||||
+++ belgolib/files.h Sun Dec 15 14:54:27 2002
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <fstream>
|
||||
+using namespace std;
|
||||
|
||||
#ifndef __make_dep__
|
||||
#include <string> //makedepend bug
|
||||
@@ -15,8 +16,8 @@
|
||||
class Infile : public ifstream {
|
||||
public:
|
||||
Infile();
|
||||
- Infile(const string &, int mode=ios::in, bool=false);
|
||||
- int Open(const string &, int mode=ios::in, bool=false);
|
||||
+ Infile(const string &, ios::openmode mode=ios::in, bool=false);
|
||||
+ int Open(const string &, ios::openmode mode=ios::in, bool=false);
|
||||
|
||||
protected:
|
||||
int check_open() const;
|
11
net/netmap/files/patch-belgolib::search.c
Normal file
11
net/netmap/files/patch-belgolib::search.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- belgolib/search.c.orig Sun Dec 15 14:54:27 2002
|
||||
+++ belgolib/search.c Sun Dec 15 14:54:27 2002
|
||||
@@ -5,7 +5,7 @@
|
||||
// SearchPath members
|
||||
|
||||
|
||||
-void SearchPath::add_dir(const list<string>& dlist, int depth = 0)
|
||||
+void SearchPath::add_dir(const list<string>& dlist, int depth)
|
||||
{
|
||||
for(CSiter diter = dlist.begin(); diter != dlist.end(); diter++)
|
||||
add_dir( *diter, depth);
|
10
net/netmap/files/patch-makelist::config.h
Normal file
10
net/netmap/files/patch-makelist::config.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- makelist/config.h.orig Sun Dec 15 14:54:27 2002
|
||||
+++ makelist/config.h Sun Dec 15 14:54:27 2002
|
||||
@@ -2,6 +2,7 @@
|
||||
#define _config_h_
|
||||
|
||||
#include <string>
|
||||
+using namespace std;
|
||||
|
||||
extern int par_traceroute;
|
||||
|
10
net/netmap/files/patch-netmap::config.h
Normal file
10
net/netmap/files/patch-netmap::config.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- netmap/config.h.orig Sun Dec 15 14:54:26 2002
|
||||
+++ netmap/config.h Sun Dec 15 14:54:26 2002
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <list>
|
||||
#include <string>
|
||||
+using namespace std;
|
||||
|
||||
const string version = "NetMap 0.1.2 20011221";
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- netmap/lookup.c.orig Sun Feb 10 02:57:26 2002
|
||||
+++ netmap/lookup.c Sun Feb 10 02:59:22 2002
|
||||
--- netmap/lookup.c.orig Sun Dec 15 14:54:26 2002
|
||||
+++ netmap/lookup.c Sun Dec 15 14:54:26 2002
|
||||
@@ -1,6 +1,8 @@
|
||||
#include <strstream>
|
||||
#include <iostream>
|
||||
|
@ -9,3 +9,21 @@
|
|||
#include <netdb.h> //hostent def
|
||||
|
||||
//from belgolib
|
||||
@@ -83,7 +85,7 @@
|
||||
if(verbose_lvl)
|
||||
cout << indent(2) << "Reading " << fname << endl;
|
||||
|
||||
- Infile cfile(fname, ios::bin | ios::in);
|
||||
+ Infile cfile(fname, ios::binary | ios::in);
|
||||
|
||||
while(cfile && !cfile.eof()) {
|
||||
HostRec hr;
|
||||
@@ -229,7 +231,7 @@
|
||||
|
||||
void LookUp::read_failedip(const string& fname)
|
||||
{
|
||||
- Infile cfile(fname, ios::bin | ios::in);
|
||||
+ Infile cfile(fname, ios::binary | ios::in);
|
||||
|
||||
while(cfile && !cfile.eof()) {
|
||||
string ip;
|
||||
|
|
11
net/netmap/files/patch-netmap::misc.c
Normal file
11
net/netmap/files/patch-netmap::misc.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- netmap/misc.c.orig Sun Dec 15 14:54:26 2002
|
||||
+++ netmap/misc.c Sun Dec 15 14:54:26 2002
|
||||
@@ -54,7 +54,7 @@
|
||||
return false;
|
||||
|
||||
bool had_point = false;
|
||||
- int beyond_point = 0;
|
||||
+ unsigned int beyond_point = 0;
|
||||
|
||||
int int_first = 0;
|
||||
for(unsigned i = 0; i < str.length(); i++) {
|
10
net/netmap/files/patch-netmap::misc.h
Normal file
10
net/netmap/files/patch-netmap::misc.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- netmap/misc.h.orig Sun Dec 15 14:54:26 2002
|
||||
+++ netmap/misc.h Sun Dec 15 14:54:26 2002
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <list>
|
||||
+using namespace std;
|
||||
|
||||
|
||||
string indent(unsigned);
|
20
net/netmap/files/patch-netmap::netmap.c
Normal file
20
net/netmap/files/patch-netmap::netmap.c
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- netmap/netmap.c.orig Sun Dec 15 14:54:26 2002
|
||||
+++ netmap/netmap.c Sun Dec 15 14:54:26 2002
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
int count_invalid_hosts(const string& fname)
|
||||
{
|
||||
- Infile inf(fname, ios::bin | ios::in);
|
||||
+ Infile inf(fname, ios::binary | ios::in);
|
||||
|
||||
int invalid_hosts = 0;
|
||||
int invalid_left = 0;
|
||||
@@ -60,7 +60,7 @@
|
||||
const int num_invalid_hosts =
|
||||
(keep_reading?count_invalid_hosts(fname):0);
|
||||
|
||||
- Infile inf(fname, ios::bin | ios::in);
|
||||
+ Infile inf(fname, ios::binary | ios::in);
|
||||
|
||||
int mark_first = 1;
|
||||
string prev_addr = inv_ip;
|
Loading…
Reference in a new issue