head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.26 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.24 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.22 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.20 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.18 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.16 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.14 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.12 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.10 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.8 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.6 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.1.1.1.0.18 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.16 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.14 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.12 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.10 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.8 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.6 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2007.05.22.12.17.34; author spz; state dead; branches; next 1.1; 1.1 date 2005.02.28.12.37.29; author spz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.02.28.12.37.29; author spz; state Exp; branches; next ; desc @@ 1.2 log @new version, new patches: upstream adopted a bunch of ours, but gcc found new things to bitch about @ text @$NetBSD: patch-ag,v 1.1 2005/02/28 12:37:29 spz Exp $ --- src/Core/gnu/ACG.cc.orig 2002-03-27 12:32:59.000000000 +0100 +++ src/Core/gnu/ACG.cc @@@@ -123,7 +123,7 @@@@ static int randomStateTable[][3] = { // #define RANDOM_PERM_SIZE 64 -_G_uint32_t randomPermutations[RANDOM_PERM_SIZE] = { +uint32_t randomPermutations[RANDOM_PERM_SIZE] = { 0xffffffff, 0x00000000, 0x00000000, 0x00000000, // 3210 0x0000ffff, 0x00ff0000, 0x00000000, 0xff000000, // 2310 0xff0000ff, 0x0000ff00, 0x00000000, 0x00ff0000, // 3120 @@@@ -149,7 +149,7 @@@@ _G_uint32_t randomPermutations[RANDOM_PE // SEED_TABLE_SIZE must be a power of 2 // #define SEED_TABLE_SIZE 32 -static _G_uint32_t seedTable[SEED_TABLE_SIZE] = { +static uint32_t seedTable[SEED_TABLE_SIZE] = { 0xbdcc47e5, 0x54aea45d, 0xec0df859, 0xda84637b, 0xc8c6cb4f, 0x35574b01, 0x28260b7d, 0x0d07fdbf, 0x9faaeeb0, 0x613dd169, 0x5ce2d818, 0x85b9e706, @@@@ -171,15 +171,15 @@@@ static _G_uint32_t seedTable[SEED_TABLE_ // LC_C = result of a long trial & error series = 3907864577 // -static const _G_uint32_t LC_A = 66049; -static const _G_uint32_t LC_C = 3907864577u; -static inline _G_uint32_t LCG(_G_uint32_t x) +static const uint32_t LC_A = 66049; +static const uint32_t LC_C = 3907864577u; +static inline uint32_t LCG(uint32_t x) { return( x * LC_A + LC_C ); } -ACG::ACG(_G_uint32_t seed, int size) +ACG::ACG(uint32_t seed, int size) { register int l; initialSeed = seed; @@@@ -205,7 +205,7 @@@@ ACG::ACG(_G_uint32_t seed, int size) // Allocate the state table & the auxillary table in a single malloc // - state = new _G_uint32_t[stateSize + auxSize]; + state = new uint32_t[stateSize + auxSize]; auxState = &state[stateSize]; reset(); @@@@ -217,7 +217,7 @@@@ ACG::ACG(_G_uint32_t seed, int size) void ACG::reset() { - register _G_uint32_t u; + register uint32_t u; if (initialSeed < SEED_TABLE_SIZE) { u = seedTable[ initialSeed ]; @@@@ -247,7 +247,7 @@@@ ACG::reset() lcgRecurr = u; - assert(sizeof(double) == 2 * sizeof(_G_int32_t)); + assert(sizeof(double) == 2 * sizeof(int32_t)); } ACG::~ACG() @@@@ -261,16 +261,16 @@@@ ACG::~ACG() // Returns 32 bits of random information. // -_G_uint32_t +uint32_t ACG::asLong() { - _G_uint32_t result = state[k] + state[j]; + uint32_t result = state[k] + state[j]; state[k] = result; j = (j <= 0) ? (stateSize-1) : (j-1); k = (k <= 0) ? (stateSize-1) : (k-1); short int auxIndex = (result >> 24) & (auxSize - 1); - register _G_uint32_t auxACG = auxState[auxIndex]; + register uint32_t auxACG = auxState[auxIndex]; auxState[auxIndex] = lcgRecurr = LCG(lcgRecurr); // @@@@ -278,7 +278,7 @@@@ ACG::asLong() // do not want to run off the end of the permutation table. // This insures that we have always got four entries left. // - register _G_uint32_t *perm = & randomPermutations[result & 0x3c]; + register uint32_t *perm = & randomPermutations[result & 0x3c]; result = *(perm++) & auxACG; result |= *(perm++) & ((auxACG << 24) @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @IRRToolSet is a suite of policy analysis tools to operate with routing policies in RPSL [RFC 2622] format, registered in an Internet Routing Registry(IRR). The main goal of the project is to make routing information more convenient and useful for network engineers, by providing tools for automated router configuration, routing policies analysis, and maintenance. @ text @@