Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+4 -4
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-src_ordBase.h,v 1.1 2012/12/20 21:47:31 joerg Exp $
$NetBSD: patch-src_ordBase.h,v 1.2 2013/07/19 12:53:09 joerg Exp $
--- src/ordBase.h.orig 2012-12-20 18:34:49.000000000 +0000
--- src/ordBase.h.orig 2010-01-17 04:50:43.000000000 +0000
+++ src/ordBase.h
@@ -5,9 +5,9 @@
#include <string>
@@ -21,8 +21,8 @@ $NetBSD: patch-src_ordBase.h,v 1.1 2012/12/20 21:47:31 joerg Exp $
- const Ordinal& iter, const Ordinal* const * params,
- const Ordinal* drillDown);
+ friend const Ordinal& admisLevelFunctional(const Ordinal& levCK,
+ const Ordinal& iter, const Ordinal* const * params=NULL,
+ const Ordinal& drillDown=Ordinal::zero);
+ const Ordinal& iter, const Ordinal* const * params,
+ const Ordinal& drillDown);
static int idCount ;
bool inDeleteList ;
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-src_parse.y,v 1.1 2014/01/16 18:09:46 asau Exp $
malloc.h raises error on FreeBSD intentionally.
--- src/parse.y.orig 2010-01-17 04:47:28.000000000 +0000
+++ src/parse.y
@@ -1,5 +1,5 @@
%{
-#include <malloc.h>
+#include <stdlib.h>
#include <iostream>
#include <stdlib.h>
#include "ordinal.h"