PERFORCE change 104970 for review

Paolo Pisati piso at FreeBSD.org
Thu Aug 24 18:36:08 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=104970

Change 104970 by piso at piso_newluxor on 2006/08/24 18:35:27

	Axe some 4.x compatibility code i left in.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#4 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#7 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#4 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#4 (text+ko) ====

@@ -373,9 +373,7 @@
 		error = 0;
 		handler_chain_init();
 		break;
-#if __FreeBSD_version >= 500000
 	case MOD_QUIESCE:
-#endif
 	case MOD_UNLOAD:
 	        handler_chain_destroy();
 	        finishoff();

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#7 (text+ko) ====

@@ -58,11 +58,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
-#if __FreeBSD_version < 500000
-#include <machine/limits.h>
-#else
 #include <sys/limits.h>
-#endif
 #else
 #include <errno.h>
 #include <sys/types.h>

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#3 (text+ko) ====

@@ -51,16 +51,11 @@
 #include <sys/sysctl.h>
 
 #ifdef _KERNEL
-#if __FreeBSD_version >= 500000
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
-#else
-#include <sys/types.h>
-#include <sys/systm.h>
-#endif
 #endif
 
 /* XXX: LibAliasSetTarget() uses this constant. */

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#4 (text+ko) ====

@@ -60,11 +60,7 @@
 #include <sys/libkern.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#if __FreeBSD_version < 500000
-#include <machine/limits.h>
-#else
 #include <sys/limits.h>
-#endif
 #else
 #include <sys/types.h>
 #include <sys/socket.h>


More information about the p4-projects mailing list