head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.12.08.17.56;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	91iw8P1zb7EcYmQr;

1.1.2.1
date	2006.10.12.08.17.56;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.47.45;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@fix building under more C++ strict GCC 4.1
@
text
@Index: src/resolver.h
--- src/resolver.h.orig	2005-10-15 18:10:01 +0200
+++ src/resolver.h	2006-10-12 10:13:51 +0200
@@@@ -10,8 +10,8 @@@@
 class Resolver
 {
 	public:
-	Resolver::Resolver(void);
-	Resolver::~Resolver(void);
+	Resolver(void);
+	~Resolver(void);
 	int add_request(char *request, enum resolver_action act);
 
 
@


1.1.2.1
log
@file apachetop.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:47:45 +0000
@
text
@d1 14
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 14
Index: src/resolver.h
--- src/resolver.h.orig	2005-10-15 18:10:01 +0200
+++ src/resolver.h	2006-10-12 10:13:51 +0200
@@@@ -10,8 +10,8 @@@@
 class Resolver
 {
 	public:
-	Resolver::Resolver(void);
-	Resolver::~Resolver(void);
+	Resolver(void);
+	~Resolver(void);
 	int add_request(char *request, enum resolver_action act);
 
 
@