Changeset 25147

Show
Ignore:
Timestamp:
28.02.2012 13:59:00 (8 years ago)
Author:
kjdon
Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

Location:
main/trunk/greenstone2/common-src/indexers
Files:
201 modified
2 copied

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mg/Makefile.in

    r22058 r25147  
    2828 
    2929CC = @CC@ 
    30 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic  
     30CFLAGS = @CFLAGS@ -fpic  
    3131INSTALL = @INSTALL@ 
    3232INSTALL_DATA = @INSTALL_DATA@ 
    3333INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    34 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@  
     34LDFLAGS = @LDFLAGS@  
    3535LIBS = @LIBS@   
    3636TOUCH = echo timestamp > 
  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r23356 r25147  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.67. 
     3# Generated by GNU Autoconf 2.65. 
    44# 
    55# 
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
    8 # Foundation, Inc. 
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 
     8# Inc. 
    99# 
    1010# 
     
    317317    done 
    318318    test -z "$as_dirs" || eval "mkdir $as_dirs" 
    319   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 
     319  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 
    320320 
    321321 
     
    357357 
    358358 
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD] 
    360 # ---------------------------------------- 
     359# as_fn_error ERROR [LINENO LOG_FD] 
     360# --------------------------------- 
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 
    362362# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 
    363 # script with STATUS, using 1 if that was 0. 
     363# script with status $?, using 1 if that was 0. 
    364364as_fn_error () 
    365365{ 
    366   as_status=$1; test $as_status -eq 0 && as_status=1 
    367   if test "$4"; then 
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 
     366  as_status=$?; test $as_status -eq 0 && as_status=1 
     367  if test "$3"; then 
     368    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
     369    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 
    370370  fi 
    371   $as_echo "$as_me: error: $2" >&2 
     371  $as_echo "$as_me: error: $1" >&2 
    372372  as_fn_exit $as_status 
    373373} # as_fn_error 
     
    531531 
    532532# Name of the host. 
    533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 
     533# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 
    534534# so uname gets run too. 
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 
     
    626626CXXFLAGS 
    627627CXX 
    628 COMPAT32BITFLAGS 
    629628ENABLE_JAVA 
    630629VERSION 
     
    763762 
    764763  case $ac_option in 
    765   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 
    766   *=)   ac_optarg= ;; 
    767   *)    ac_optarg=yes ;; 
     764  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 
     765  *)    ac_optarg=yes ;; 
    768766  esac 
    769767 
     
    810808    # Reject names that are not valid shell variable names. 
    811809    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 
    812       as_fn_error $? "invalid feature name: $ac_useropt" 
     810      as_fn_error "invalid feature name: $ac_useropt" 
    813811    ac_useropt_orig=$ac_useropt 
    814812    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 
     
    836834    # Reject names that are not valid shell variable names. 
    837835    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 
    838       as_fn_error $? "invalid feature name: $ac_useropt" 
     836      as_fn_error "invalid feature name: $ac_useropt" 
    839837    ac_useropt_orig=$ac_useropt 
    840838    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 
     
    10401038    # Reject names that are not valid shell variable names. 
    10411039    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 
    1042       as_fn_error $? "invalid package name: $ac_useropt" 
     1040      as_fn_error "invalid package name: $ac_useropt" 
    10431041    ac_useropt_orig=$ac_useropt 
    10441042    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 
     
    10561054    # Reject names that are not valid shell variable names. 
    10571055    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 
    1058       as_fn_error $? "invalid package name: $ac_useropt" 
     1056      as_fn_error "invalid package name: $ac_useropt" 
    10591057    ac_useropt_orig=$ac_useropt 
    10601058    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 
     
    10861084    x_libraries=$ac_optarg ;; 
    10871085 
    1088   -*) as_fn_error $? "unrecognized option: \`$ac_option' 
    1089 Try \`$0 --help' for more information" 
     1086  -*) as_fn_error "unrecognized option: \`$ac_option' 
     1087Try \`$0 --help' for more information." 
    10901088    ;; 
    10911089 
     
    10951093    case $ac_envvar in #( 
    10961094      '' | [0-9]* | *[!_$as_cr_alnum]* ) 
    1097       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 
     1095      as_fn_error "invalid variable name: \`$ac_envvar'" ;; 
    10981096    esac 
    10991097    eval $ac_envvar=\$ac_optarg 
     
    11131111if test -n "$ac_prev"; then 
    11141112  ac_option=--`echo $ac_prev | sed 's/_/-/g'` 
    1115   as_fn_error $? "missing argument to $ac_option" 
     1113  as_fn_error "missing argument to $ac_option" 
    11161114fi 
    11171115 
     
    11191117  case $enable_option_checking in 
    11201118    no) ;; 
    1121     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 
     1119    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 
    11221120    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 
    11231121  esac 
     
    11421140    NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 
    11431141  esac 
    1144   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 
     1142  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 
    11451143done 
    11461144 
     
    11561154  if test "x$build_alias" = x; then 
    11571155    cross_compiling=maybe 
    1158     $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 
    1159     If a cross compiler is detected then cross compile mode will be used" >&2 
     1156    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 
     1157    If a cross compiler is detected then cross compile mode will be used." >&2 
    11601158  elif test "x$build_alias" != "x$host_alias"; then 
    11611159    cross_compiling=yes 
     
    11721170ac_ls_di=`ls -di .` && 
    11731171ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 
    1174   as_fn_error $? "working directory cannot be determined" 
     1172  as_fn_error "working directory cannot be determined" 
    11751173test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 
    1176   as_fn_error $? "pwd does not report name of working directory" 
     1174  as_fn_error "pwd does not report name of working directory" 
    11771175 
    11781176 
     
    12131211if test ! -r "$srcdir/$ac_unique_file"; then 
    12141212  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 
    1215   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 
     1213  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 
    12161214fi 
    12171215ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 
    12181216ac_abs_confdir=`( 
    1219     cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 
     1217    cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 
    12201218    pwd)` 
    12211219# When building in place, set srcdir=. 
     
    12571255      --help=recursive    display the short help of all the included packages 
    12581256  -V, --version           display version information and exit 
    1259   -q, --quiet, --silent   do not print \`checking ...' messages 
     1257  -q, --quiet, --silent   do not print \`checking...' messages 
    12601258      --cache-file=FILE   cache test results in FILE [disabled] 
    12611259  -C, --config-cache      alias for \`--cache-file=config.cache' 
     
    14131411  cat <<\_ACEOF 
    14141412configure 
    1415 generated by GNU Autoconf 2.67 
    1416  
    1417 Copyright (C) 2010 Free Software Foundation, Inc. 
     1413generated by GNU Autoconf 2.65 
     1414 
     1415Copyright (C) 2009 Free Software Foundation, Inc. 
    14181416This configure script is free software; the Free Software Foundation 
    14191417gives unlimited permission to copy, distribute and modify it. 
     
    15231521  fi 
    15241522  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    1525   test $ac_status = 0; } > conftest.i && { 
     1523  test $ac_status = 0; } >/dev/null && { 
    15261524     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 
    15271525     test ! -s conftest.err 
     
    15471545{ 
    15481546  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
    1549   if eval "test \"\${$3+set}\"" = set; then : 
     1547  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    15501548  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    15511549$as_echo_n "checking for $2... " >&6; } 
    1552 if eval "test \"\${$3+set}\"" = set; then : 
     1550if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    15531551  $as_echo_n "(cached) " >&6 
    15541552fi 
     
    15861584  ac_header_preproc=no 
    15871585fi 
    1588 rm -f conftest.err conftest.i conftest.$ac_ext 
     1586rm -f conftest.err conftest.$ac_ext 
    15891587{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 
    15901588$as_echo "$ac_header_preproc" >&6; } 
     
    16131611  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    16141612$as_echo_n "checking for $2... " >&6; } 
    1615 if eval "test \"\${$3+set}\"" = set; then : 
     1613if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    16161614  $as_echo_n "(cached) " >&6 
    16171615else 
     
    16771675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    16781676$as_echo_n "checking for $2... " >&6; } 
    1679 if eval "test \"\${$3+set}\"" = set; then : 
     1677if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    16801678  $as_echo_n "(cached) " >&6 
    16811679else 
     
    17541752  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    17551753$as_echo_n "checking for $2... " >&6; } 
    1756 if eval "test \"\${$3+set}\"" = set; then : 
     1754if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    17571755  $as_echo_n "(cached) " >&6 
    17581756else 
     
    18071805  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    18081806$as_echo_n "checking for $2... " >&6; } 
    1809 if eval "test \"\${$3+set}\"" = set; then : 
     1807if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 
    18101808  $as_echo_n "(cached) " >&6 
    18111809else 
     
    18701868 
    18711869It was created by $as_me, which was 
    1872 generated by GNU Autoconf 2.67.  Invocation command line was 
     1870generated by GNU Autoconf 2.65.  Invocation command line was 
    18731871 
    18741872  $ $0 $@ 
     
    19801978    echo 
    19811979 
    1982     $as_echo "## ---------------- ## 
     1980    cat <<\_ASBOX 
     1981## ---------------- ## 
    19831982## Cache variables. ## 
    1984 ## ---------------- ##" 
     1983## ---------------- ## 
     1984_ASBOX 
    19851985    echo 
    19861986    # The following way of writing the cache mishandles newlines in values, 
     
    20162016    echo 
    20172017 
    2018     $as_echo "## ----------------- ## 
     2018    cat <<\_ASBOX 
     2019## ----------------- ## 
    20192020## Output variables. ## 
    2020 ## ----------------- ##" 
     2021## ----------------- ## 
     2022_ASBOX 
    20212023    echo 
    20222024    for ac_var in $ac_subst_vars 
     
    20312033 
    20322034    if test -n "$ac_subst_files"; then 
    2033       $as_echo "## ------------------- ## 
     2035      cat <<\_ASBOX 
     2036## ------------------- ## 
    20342037## File substitutions. ## 
    2035 ## ------------------- ##" 
     2038## ------------------- ## 
     2039_ASBOX 
    20362040      echo 
    20372041      for ac_var in $ac_subst_files 
     
    20472051 
    20482052    if test -s confdefs.h; then 
    2049       $as_echo "## ----------- ## 
     2053      cat <<\_ASBOX 
     2054## ----------- ## 
    20502055## confdefs.h. ## 
    2051 ## ----------- ##" 
     2056## ----------- ## 
     2057_ASBOX 
    20522058      echo 
    20532059      cat confdefs.h 
     
    21042110ac_site_file2=NONE 
    21052111if test -n "$CONFIG_SITE"; then 
    2106   # We do not want a PATH search for config.site. 
    2107   case $CONFIG_SITE in #(( 
    2108     -*)  ac_site_file1=./$CONFIG_SITE;; 
    2109     */*) ac_site_file1=$CONFIG_SITE;; 
    2110     *)   ac_site_file1=./$CONFIG_SITE;; 
    2111   esac 
     2112  ac_site_file1=$CONFIG_SITE 
    21122113elif test "x$prefix" != xNONE; then 
    21132114  ac_site_file1=$prefix/share/config.site 
     
    21242125$as_echo "$as_me: loading site script $ac_site_file" >&6;} 
    21252126    sed 's/^/| /' "$ac_site_file" >&5 
    2126     . "$ac_site_file" \ 
    2127       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    2128 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    2129 as_fn_error $? "failed to load site script $ac_site_file 
    2130 See \`config.log' for more details" "$LINENO" 5 ; } 
     2127    . "$ac_site_file" 
    21312128  fi 
    21322129done 
     
    22042201  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 
    22052202$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 
    2206   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 
     2203  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 
    22072204fi 
    22082205## -------------------- ## 
     
    22222219ac_aux_dir= 
    22232220for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 
    2224   if test -f "$ac_dir/install-sh"; then 
    2225     ac_aux_dir=$ac_dir 
    2226     ac_install_sh="$ac_aux_dir/install-sh -c" 
    2227     break 
    2228   elif test -f "$ac_dir/install.sh"; then 
    2229     ac_aux_dir=$ac_dir 
    2230     ac_install_sh="$ac_aux_dir/install.sh -c" 
    2231     break 
    2232   elif test -f "$ac_dir/shtool"; then 
    2233     ac_aux_dir=$ac_dir 
    2234     ac_install_sh="$ac_aux_dir/shtool install -c" 
    2235     break 
    2236   fi 
     2221  for ac_t in install-sh install.sh shtool; do 
     2222    if test -f "$ac_dir/$ac_t"; then 
     2223      ac_aux_dir=$ac_dir 
     2224      ac_install_sh="$ac_aux_dir/$ac_t -c" 
     2225      break 2 
     2226    fi 
     2227  done 
    22372228done 
    22382229if test -z "$ac_aux_dir"; then 
    2239   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 
     2230  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 
    22402231fi 
    22412232 
     
    22512242# Make sure we can run config.sub. 
    22522243$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 
    2253   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 
     2244  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 
    22542245 
    22552246{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 
     
    22622253  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 
    22632254test "x$ac_build_alias" = x && 
    2264   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 
     2255  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 
    22652256ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 
    2266   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 
     2257  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 
    22672258 
    22682259fi 
     
    22712262case $ac_cv_build in 
    22722263*-*-*) ;; 
    2273 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
     2264*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 
    22742265esac 
    22752266build=$ac_cv_build 
     
    22962287else 
    22972288  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 
    2298     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 
     2289    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 
    22992290fi 
    23002291 
     
    23042295case $ac_cv_host in 
    23052296*-*-*) ;; 
    2306 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
     2297*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 
    23072298esac 
    23082299host=$ac_cv_host 
     
    23292320else 
    23302321  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 
    2331     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 
     2322    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 
    23322323fi 
    23332324 
     
    23372328case $ac_cv_target in 
    23382329*-*-*) ;; 
    2339 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
     2330*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 
    23402331esac 
    23412332target=$ac_cv_target 
     
    24022393else 
    24032394  ENABLE_JAVA=0 
    2404 fi 
    2405  
    2406  
    2407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5 
    2408 $as_echo_n "checking to see if architecture is 64-bit... " >&6; } 
    2409 arch_64bit=no 
    2410 case "$host_cpu" in 
    2411 x86_64) arch_64bit=yes ;; 
    2412 esac 
    2413  
    2414 if test "$arch_64bit" = yes; then 
    2415   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    2416 $as_echo "yes" >&6; } 
    2417   if test -z "$COMPAT32BITFLAGS" ; then 
    2418     COMPAT32BITFLAGS="-m32" 
    2419   fi 
    2420 else 
    2421   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
    2422 $as_echo "no" >&6; } 
    2423   if test -z "$COMPAT32BITFLAGS" ; then 
    2424     COMPAT32BITFLAGS= 
    2425   fi 
    24262395fi 
    24272396 
     
    26512620{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    26522621$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    2653 as_fn_error 77 "C++ compiler cannot create executables 
    2654 See \`config.log' for more details" "$LINENO" 5 ; } 
     2622{ as_fn_set_status 77 
     2623as_fn_error "C++ compiler cannot create executables 
     2624See \`config.log' for more details." "$LINENO" 5; }; } 
    26552625else 
    26562626  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
     
    26942664  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    26952665$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    2696 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2697 See \`config.log' for more details" "$LINENO" 5 ; } 
     2666as_fn_error "cannot compute suffix of executables: cannot compile and link 
     2667See \`config.log' for more details." "$LINENO" 5; } 
    26982668fi 
    26992669rm -f conftest conftest$ac_cv_exeext 
     
    27522722    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    27532723$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    2754 as_fn_error $? "cannot run C++ compiled programs. 
     2724as_fn_error "cannot run C++ compiled programs. 
    27552725If you meant to cross compile, use \`--host'. 
    2756 See \`config.log' for more details" "$LINENO" 5 ; } 
     2726See \`config.log' for more details." "$LINENO" 5; } 
    27572727    fi 
    27582728  fi 
     
    28052775{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    28062776$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    2807 as_fn_error $? "cannot compute suffix of object files: cannot compile 
    2808 See \`config.log' for more details" "$LINENO" 5 ; } 
     2777as_fn_error "cannot compute suffix of object files: cannot compile 
     2778See \`config.log' for more details." "$LINENO" 5; } 
    28092779fi 
    28102780rm -f conftest.$ac_cv_objext conftest.$ac_ext 
     
    33203290test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    33213291$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    3322 as_fn_error $? "no acceptable C compiler found in \$PATH 
    3323 See \`config.log' for more details" "$LINENO" 5 ; } 
     3292as_fn_error "no acceptable C compiler found in \$PATH 
     3293See \`config.log' for more details." "$LINENO" 5; } 
    33243294 
    33253295# Provide some information about the compiler. 
     
    36683638set x ${MAKE-make} 
    36693639ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 
    3670 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : 
     3640if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 
    36713641  $as_echo_n "(cached) " >&6 
    36723642else 
     
    36763646    @echo '@@@%%%=$(MAKE)=@@@%%%' 
    36773647_ACEOF 
    3678 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 
     3648# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 
    36793649case `${MAKE-make} -f conftest.make 2>/dev/null` in 
    36803650  *@@@%%%=?*=@@@%%%*) 
     
    38793849 
    38803850    fi 
    3881     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 
     3851    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 
    38823852fi 
    38833853 
     
    39413911        ac_cv_prog_uudecode_base64=yes 
    39423912else 
    3943         echo "configure: 3943: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
     3913        echo "configure: 3913: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
    39443914        echo "configure: failed file was:" >&5 
    39453915        cat Test.uue >&5 
     
    39563926$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 
    39573927        if test x$ac_cv_prog_javac_works = xno; then 
    3958                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 
     3928                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 
    39593929        fi 
    39603930        if test x$ac_cv_prog_javac_works = x; then 
     
    40494019 
    40504020  fi 
    4051   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5 
     4021  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 
    40524022else 
    40534023  echo "Checking for javac... $JAVAC" 
     
    40644034CLASS_TEST=Test.class 
    40654035cat << \EOF > $JAVA_TEST 
    4066 /* #line 4066 "configure" */ 
     4036/* #line 4036 "configure" */ 
    40674037public class Test { 
    40684038} 
     
    40764046  ac_cv_prog_javac_works=yes 
    40774047else 
    4078   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
     4048  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
    40794049  echo "configure: failed program was:" >&5 
    40804050  cat $JAVA_TEST >&5 
     
    41034073TEST=Test 
    41044074cat << \EOF > $JAVA_TEST 
    4105 /* [#]line 4105 "configure" */ 
     4075/* [#]line 4075 "configure" */ 
    41064076public class Test { 
    41074077public static void main (String args[]) { 
     
    41204090          echo "configure: failed program was:" >&5 
    41214091          cat $JAVA_TEST >&5 
    4122           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
     4092          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
    41234093        fi 
    41244094fi 
     
    41334103  echo "configure: failed program was:" >&5 
    41344104  cat $JAVA_TEST >&5 
    4135   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
     4105  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
    41364106fi 
    41374107rm -fr $JAVA_TEST $CLASS_TEST Test.uue 
     
    42334203 
    42344204  fi 
    4235   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5 
     4205  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 
    42364206else 
    42374207  echo "Checking for javac... $JAVAC" 
     
    42484218CLASS_TEST=Test.class 
    42494219cat << \EOF > $JAVA_TEST 
    4250 /* #line 4250 "configure" */ 
     4220/* #line 4220 "configure" */ 
    42514221public class Test { 
    42524222} 
     
    42604230  ac_cv_prog_javac_works=yes 
    42614231else 
    4262   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
     4232  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 
    42634233  echo "configure: failed program was:" >&5 
    42644234  cat $JAVA_TEST >&5 
     
    43204290continue 
    43214291fi 
    4322 rm -f conftest.err conftest.i conftest.$ac_ext 
     4292rm -f conftest.err conftest.$ac_ext 
    43234293 
    43244294  # OK, works on sane cases.  Now check whether nonexistent headers 
     
    43364306break 
    43374307fi 
    4338 rm -f conftest.err conftest.i conftest.$ac_ext 
     4308rm -f conftest.err conftest.$ac_ext 
    43394309 
    43404310done 
    43414311# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 
    4342 rm -f conftest.i conftest.err conftest.$ac_ext 
     4312rm -f conftest.err conftest.$ac_ext 
    43434313if $ac_preproc_ok; then : 
    43444314  break 
     
    43794349continue 
    43804350fi 
    4381 rm -f conftest.err conftest.i conftest.$ac_ext 
     4351rm -f conftest.err conftest.$ac_ext 
    43824352 
    43834353  # OK, works on sane cases.  Now check whether nonexistent headers 
     
    43954365break 
    43964366fi 
    4397 rm -f conftest.err conftest.i conftest.$ac_ext 
     4367rm -f conftest.err conftest.$ac_ext 
    43984368 
    43994369done 
    44004370# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 
    4401 rm -f conftest.i conftest.err conftest.$ac_ext 
     4371rm -f conftest.err conftest.$ac_ext 
    44024372if $ac_preproc_ok; then : 
    44034373 
     
    44054375  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    44064376$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    4407 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4408 See \`config.log' for more details" "$LINENO" 5 ; } 
     4377as_fn_error "C preprocessor \"$CPP\" fails sanity check 
     4378See \`config.log' for more details." "$LINENO" 5; } 
    44094379fi 
    44104380 
     
    44674437IFS=$as_save_IFS 
    44684438  if test -z "$ac_cv_path_GREP"; then 
    4469     as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 
     4439    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 
    44704440  fi 
    44714441else 
     
    45334503IFS=$as_save_IFS 
    45344504  if test -z "$ac_cv_path_EGREP"; then 
    4535     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 
     4505    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 
    45364506  fi 
    45374507else 
     
    46654635ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 
    46664636" 
    4667 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 
     4637eval as_val=\$$as_ac_Header 
     4638   if test "x$as_val" = x""yes; then : 
    46684639  cat >>confdefs.h <<_ACEOF 
    46694640#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 
     
    50975068{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 
    50985069$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 
    5099 if eval "test \"\${$as_ac_Header+set}\"" = set; then : 
     5070if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 
    51005071  $as_echo_n "(cached) " >&6 
    51015072else 
     
    51245095           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 
    51255096$as_echo "$ac_res" >&6; } 
    5126 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 
     5097eval as_val=\$$as_ac_Header 
     5098   if test "x$as_val" = x""yes; then : 
    51275099  cat >>confdefs.h <<_ACEOF 
    51285100#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 
     
    53665338  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 
    53675339ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 
    5368 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 
     5340eval as_val=\$$as_ac_Header 
     5341   if test "x$as_val" = x""yes; then : 
    53695342  cat >>confdefs.h <<_ACEOF 
    53705343#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 
     
    55395512    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 
    55405513ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 
    5541 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 
     5514eval as_val=\$$as_ac_var 
     5515   if test "x$as_val" = x""yes; then : 
    55425516 
    55435517cat >>confdefs.h <<_ACEOF 
     
    56995673  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 
    57005674ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 
    5701 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 
     5675eval as_val=\$$as_ac_var 
     5676   if test "x$as_val" = x""yes; then : 
    57025677  cat >>confdefs.h <<_ACEOF 
    57035678#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 
     
    57075682done 
    57085683 
    5709 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 
    5710 if test "x$ac_cv_func_ftruncate" = x""yes; then : 
    5711   $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 
     5684for ac_func in ftruncate strstr strcasecmp 
     5685do : 
     5686  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 
     5687ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 
     5688eval as_val=\$$as_ac_var 
     5689   if test "x$as_val" = x""yes; then : 
     5690  cat >>confdefs.h <<_ACEOF 
     5691#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 
     5692_ACEOF 
    57125693 
    57135694else 
    57145695  case " $LIBOBJS " in 
    5715   *" ftruncate.$ac_objext "* ) ;; 
    5716   *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext" 
     5696  *" $ac_func.$ac_objext "* ) ;; 
     5697  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 
    57175698 ;; 
    57185699esac 
    57195700 
    57205701fi 
    5721  
    5722 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 
    5723 if test "x$ac_cv_func_strstr" = x""yes; then : 
    5724   $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 
    5725  
    5726 else 
    5727   case " $LIBOBJS " in 
    5728   *" strstr.$ac_objext "* ) ;; 
    5729   *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 
    5730  ;; 
    5731 esac 
    5732  
    5733 fi 
    5734  
    5735 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 
    5736 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 
    5737   $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 
    5738  
    5739 else 
    5740   case " $LIBOBJS " in 
    5741   *" strcasecmp.$ac_objext "* ) ;; 
    5742   *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 
    5743  ;; 
    5744 esac 
    5745  
    5746 fi 
     5702done 
    57475703 
    57485704 
     
    60936049     ;; #( 
    60946050   *) 
    6095      as_fn_error $? "unknown endianness 
    6096  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
     6051     as_fn_error "unknown endianness 
     6052 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
    60976053 esac 
    60986054 
     
    62046160ac_libobjs= 
    62056161ac_ltlibobjs= 
    6206 U= 
    62076162for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 
    62086163  # 1. Remove the extension, and $U if already installed. 
     
    63676322 
    63686323 
    6369 # as_fn_error STATUS ERROR [LINENO LOG_FD] 
    6370 # ---------------------------------------- 
     6324# as_fn_error ERROR [LINENO LOG_FD] 
     6325# --------------------------------- 
    63716326# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 
    63726327# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 
    6373 # script with STATUS, using 1 if that was 0. 
     6328# script with status $?, using 1 if that was 0. 
    63746329as_fn_error () 
    63756330{ 
    6376   as_status=$1; test $as_status -eq 0 && as_status=1 
    6377   if test "$4"; then 
    6378     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
    6379     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 
     6331  as_status=$?; test $as_status -eq 0 && as_status=1 
     6332  if test "$3"; then 
     6333    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
     6334    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 
    63806335  fi 
    6381   $as_echo "$as_me: error: $2" >&2 
     6336  $as_echo "$as_me: error: $1" >&2 
    63826337  as_fn_exit $as_status 
    63836338} # as_fn_error 
     
    65756530    done 
    65766531    test -z "$as_dirs" || eval "mkdir $as_dirs" 
    6577   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 
     6532  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 
    65786533 
    65796534 
     
    66296584ac_log=" 
    66306585This file was extended by $as_me, which was 
    6631 generated by GNU Autoconf 2.67.  Invocation command line was 
     6586generated by GNU Autoconf 2.65.  Invocation command line was 
    66326587 
    66336588  CONFIG_FILES    = $CONFIG_FILES 
     
    66956650ac_cs_version="\\ 
    66966651config.status 
    6697 configured by $0, generated by GNU Autoconf 2.67, 
     6652configured by $0, generated by GNU Autoconf 2.65, 
    66986653  with options \\"\$ac_cs_config\\" 
    66996654 
    6700 Copyright (C) 2010 Free Software Foundation, Inc. 
     6655Copyright (C) 2009 Free Software Foundation, Inc. 
    67016656This config.status script is free software; the Free Software Foundation 
    67026657gives unlimited permission to copy, distribute and modify it." 
     
    67156670do 
    67166671  case $1 in 
    6717   --*=?*) 
     6672  --*=*) 
    67186673    ac_option=`expr "X$1" : 'X\([^=]*\)='` 
    67196674    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 
    6720     ac_shift=: 
    6721     ;; 
    6722   --*=) 
    6723     ac_option=`expr "X$1" : 'X\([^=]*\)='` 
    6724     ac_optarg= 
    67256675    ac_shift=: 
    67266676    ;; 
     
    67466696    case $ac_optarg in 
    67476697    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 
    6748     '') as_fn_error $? "missing file argument" ;; 
    67496698    esac 
    67506699    as_fn_append CONFIG_FILES " '$ac_optarg'" 
     
    67596708  --he | --h) 
    67606709    # Conflict between --help and --header 
    6761     as_fn_error $? "ambiguous option: \`$1' 
     6710    as_fn_error "ambiguous option: \`$1' 
    67626711Try \`$0 --help' for more information.";; 
    67636712  --help | --hel | -h ) 
     
    67686717 
    67696718  # This is an error. 
    6770   -*) as_fn_error $? "unrecognized option: \`$1' 
     6719  -*) as_fn_error "unrecognized option: \`$1' 
    67716720Try \`$0 --help' for more information." ;; 
    67726721 
     
    68256774    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 
    68266775 
    6827   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
     6776  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
    68286777  esac 
    68296778done 
     
    68636812  tmp=./conf$$-$RANDOM 
    68646813  (umask 077 && mkdir "$tmp") 
    6865 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 
     6814} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 
    68666815 
    68676816# Set up the scripts for CONFIG_FILES section. 
     
    68806829ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 
    68816830if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 
    6882   ac_cs_awk_cr='\\r' 
     6831  ac_cs_awk_cr='\r' 
    68836832else 
    68846833  ac_cs_awk_cr=$ac_cr 
     
    68946843  echo "_ACEOF" 
    68956844} >conf$$subs.sh || 
    6896   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 
    6897 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 
     6845  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 
     6846ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 
    68986847ac_delim='%!_!# ' 
    68996848for ac_last_try in false false false false false :; do 
    69006849  . ./conf$$subs.sh || 
    6901     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 
     6850    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 
    69026851 
    69036852  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 
     
    69056854    break 
    69066855  elif $ac_last_try; then 
    6907     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 
     6856    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 
    69086857  else 
    69096858    ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 
     
    69946943  cat 
    69956944fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 
    6996   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 
    6997 _ACEOF 
    6998  
    6999 # VPATH may cause trouble with some makes, so we remove sole $(srcdir), 
    7000 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 
     6945  || as_fn_error "could not setup config files machinery" "$LINENO" 5 
     6946_ACEOF 
     6947 
     6948# VPATH may cause trouble with some makes, so we remove $(srcdir), 
     6949# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 
    70016950# trailing colons and then remove the whole line if VPATH becomes empty 
    70026951# (actually we leave an empty line to preserve line numbers). 
    70036952if test "x$srcdir" = x.; then 
    7004   ac_vpsub='/^[  ]*VPATH[    ]*=[    ]*/{ 
    7005 h 
    7006 s/// 
    7007 s/^/:/ 
    7008 s/[  ]*$/:/ 
    7009 s/:\$(srcdir):/:/g 
    7010 s/:\${srcdir}:/:/g 
    7011 s/:@srcdir@:/:/g 
    7012 s/^:*// 
     6953  ac_vpsub='/^[  ]*VPATH[    ]*=/{ 
     6954s/:*\$(srcdir):*/:/ 
     6955s/:*\${srcdir}:*/:/ 
     6956s/:*@srcdir@:*/:/ 
     6957s/^\([^=]*=[     ]*\):*/\1/ 
    70136958s/:*$// 
    7014 x 
    7015 s/\(=[   ]*\).*/\1/ 
    7016 G 
    7017 s/\n// 
    70186959s/^[^=]*=[   ]*$// 
    70196960}' 
     
    70436984    break 
    70446985  elif $ac_last_try; then 
    7045     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 
     6986    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 
    70466987  else 
    70476988    ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 
     
    71287069_ACEOF 
    71297070cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 
    7130   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 
     7071  as_fn_error "could not setup config headers machinery" "$LINENO" 5 
    71317072fi # test -n "$CONFIG_HEADERS" 
    71327073 
     
    71417082  case $ac_mode$ac_tag in 
    71427083  :[FHL]*:*);; 
    7143   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
     7084  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 
    71447085  :[FH]-) ac_tag=-:-;; 
    71457086  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
     
    71697110       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    71707111       esac || 
    7171        as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
     7112       as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
    71727113      esac 
    71737114      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
     
    71967137    case $ac_tag in 
    71977138    *:-:* | *:-) cat >"$tmp/stdin" \ 
    7198       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
     7139      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 
    71997140    esac 
    72007141    ;; 
     
    73277268" 
    73287269eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 
    7329   || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
     7270  || as_fn_error "could not create $ac_file" "$LINENO" 5 
    73307271 
    73317272test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 
     
    73337274  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 
    73347275  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 
    7335 which seems to be undefined.  Please make sure it is defined" >&5 
     7276which seems to be undefined.  Please make sure it is defined." >&5 
    73367277$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 
    7337 which seems to be undefined.  Please make sure it is defined" >&2;} 
     7278which seems to be undefined.  Please make sure it is defined." >&2;} 
    73387279 
    73397280  rm -f "$tmp/stdin" 
     
    73427283  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 
    73437284  esac \ 
    7344   || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
     7285  || as_fn_error "could not create $ac_file" "$LINENO" 5 
    73457286 ;; 
    73467287  :H) 
     
    73537294      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 
    73547295    } >"$tmp/config.h" \ 
    7355       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
     7296      || as_fn_error "could not create $ac_file" "$LINENO" 5 
    73567297    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 
    73577298      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 
     
    73607301      rm -f "$ac_file" 
    73617302      mv "$tmp/config.h" "$ac_file" \ 
    7362     || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
     7303    || as_fn_error "could not create $ac_file" "$LINENO" 5 
    73637304    fi 
    73647305  else 
    73657306    $as_echo "/* $configure_input  */" \ 
    73667307      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 
    7367       || as_fn_error $? "could not create -" "$LINENO" 5 
     7308      || as_fn_error "could not create -" "$LINENO" 5 
    73687309  fi 
    73697310 ;; 
     
    73877328 
    73887329test $ac_write_fail = 0 || 
    7389   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 
     7330  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 
    73907331 
    73917332 
     
    74087349  # Use ||, not &&, to avoid exiting from the if with $? = 1, which 
    74097350  # would make configure fail if this is the last instruction. 
    7410   $ac_cs_success || as_fn_exit 1 
     7351  $ac_cs_success || as_fn_exit $? 
    74117352fi 
    74127353if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 
  • main/trunk/greenstone2/common-src/indexers/mg/configure.in

    r23356 r25147  
    3434AC_SUBST(ENABLE_JAVA) 
    3535 
    36 AC_MSG_CHECKING(to see if architecture is 64-bit) 
    37 arch_64bit=no 
    38 case "$host_cpu" in 
    39 x86_64) arch_64bit=yes ;; 
    40 esac 
    41  
    42 if test "$arch_64bit" = yes; then 
    43   AC_MSG_RESULT(yes) 
    44   if test -z "$COMPAT32BITFLAGS" ; then 
    45     COMPAT32BITFLAGS="-m32" 
    46   fi 
    47 else 
    48   AC_MSG_RESULT(no) 
    49   if test -z "$COMPAT32BITFLAGS" ; then 
    50     COMPAT32BITFLAGS= 
    51   fi 
    52 fi 
    53 AC_SUBST(COMPAT32BITFLAGS) 
    54  
     36dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 
     37dnl arch_64bit=no 
     38dnl case "$host_cpu" in 
     39dnl x86_64) arch_64bit=yes ;; 
     40dnl esac 
    5541 
    5642dnl Checks for programs. 
  • main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in

    r23356 r25147  
    1717JAVAH = javah 
    1818JAR = jar 
    19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
    20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX 
     19CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
     20CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 
    2121JAVACFLAGS = @JAVACFLAGS@ 
    2222DEFS = @DEFS@ 
     
    2525INSTALL_DATA = @INSTALL_DATA@ 
    2626INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
     27LDFLAGS = @LDFLAGS@ 
    2828LIBS =  -lstdc++ @LIBS@ 
    2929TOUCH = echo timestamp > 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c

    r16583 r25147  
    180180 
    181181  /* Save the object on the Java side */ 
    182   (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (long) data); 
     182  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data); 
    183183 
    184184  /* Initialise MG environment variables */ 
     
    250250  query_data* qd; 
    251251 
    252   u_long pos, len; 
     252  mg_u_long pos, len; 
    253253  u_char* c_buffer = NULL; 
    254254  u_char* uc_buffer = NULL; 
     
    287287 
    288288  /* Get the document position and length in the text file */ 
    289   printf("Fetching document number %ld...\n", (unsigned long) j_docnum); 
    290   FetchDocStart(qd, (unsigned long) j_docnum, &pos, &len); 
    291   printf("Fetched document start. Pos: %ld, Len: %ld\n", pos, len); 
     289  printf("Fetching document number %d...\n", (mg_u_long) j_docnum); 
     290  FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len); 
     291  printf("Fetched document start. Pos: %d, Len: %d\n", pos, len); 
    292292 
    293293  /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */ 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c

    r16583 r25147  
    619619 
    620620  /* Print the data to a character array */ 
    621   sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%ld\n", 
     621  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n", 
    622622      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index), 
    623623      (data->defaultStemMethod & 1), 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

    r16583 r25147  
    168168 
    169169  /* Save the object on the Java side */ 
    170   (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (long) data); 
     170  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data); 
    171171 
    172172  /* Initialise MG environment variables */ 
     
    285285  query_data* qd; 
    286286 
    287   u_long pos, len; 
     287  mg_u_long pos, len; 
    288288  u_char* c_buffer = NULL; 
    289289  u_char* uc_buffer = NULL; 
     
    322322 
    323323  /* Get the document position and length in the text file */ 
    324   printf("Fetching document number %ld...\n", (unsigned long) j_docnum); 
    325   FetchDocStart(qd, (unsigned long) j_docnum, &pos, &len); 
    326   printf("Fetched document start. Pos: %ld, Len: %ld\n", pos, len); 
     324  printf("Fetching document number %d...\n", (mg_u_long) j_docnum); 
     325  FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len); 
     326  printf("Fetched document start. Pos: %d, Len: %d\n", pos, len); 
    327327 
    328328  /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */ 
     
    730730 
    731731  /* Print the data to a character array */ 
    732   sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%ld\n", 
     732  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n", 
    733733      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index), 
    734734      (data->defaultStemMethod & 1), 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.h

    r16583 r25147  
    3636  char* index; 
    3737  /* Maximum number of documents to retrieve */ 
    38   unsigned long maxDocs; 
     38  mg_u_long maxDocs; 
    3939  /* Whether term frequency information is desired (boolean value) */ 
    4040  int needTermFreqs; 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in

    r22070 r25147  
    1414AR = ar 
    1515CC = @CC@ 
    16 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 
     16CFLAGS = @CFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 
    1717DEFS = @DEFS@ 
    1818RANLIB = @RANLIB@ 
     
    2020INSTALL_DATA = @INSTALL_DATA@ 
    2121INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    22 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
     22LDFLAGS = @LDFLAGS@ 
    2323#NOTE: libmgtext.a needs to come before libmglib.a !!! 
    2424QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/Makefile.in

    r22070 r25147  
    3434AR = ar 
    3535CC = @CC@ 
    36 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic  
     36CFLAGS = @CFLAGS@ -fpic  
    3737DEFS = @DEFS@ 
    3838RANLIB = @RANLIB@ 
     
    4141# Uncomment for compiling for the nzdl project 
    4242# 
    43 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -DQUIET -fpic 
     43CFLAGS = @CFLAGS@ -DQUIET -fpic 
    4444########################################## 
    4545 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_gen.c

    r16583 r25147  
    2828int fprintf (FILE *, const char *,...); 
    2929 
    30 unsigned long  
    31 BIO_Unary_Length (unsigned long val) 
     30mg_u_long  
     31BIO_Unary_Length (mg_u_long val) 
    3232{ 
    33   register unsigned long num; 
     33  register mg_u_long num; 
    3434  UNARY_LENGTH (val, num); 
    3535  return (num); 
     
    3737 
    3838 
    39 unsigned long  
    40 BIO_Binary_Length (unsigned long val, unsigned long b) 
     39mg_u_long  
     40BIO_Binary_Length (mg_u_long val, mg_u_long b) 
    4141{ 
    42   register unsigned long num; 
     42  register mg_u_long num; 
    4343  BINARY_LENGTH (val, b, num); 
    4444  return (num); 
     
    4646 
    4747 
    48 unsigned long  
    49 BIO_Gamma_Length (unsigned long val) 
     48mg_u_long  
     49BIO_Gamma_Length (mg_u_long val) 
    5050{ 
    51   register unsigned long num; 
     51  register mg_u_long num; 
    5252  GAMMA_LENGTH (val, num); 
    5353  return (num); 
     
    5555 
    5656 
    57 unsigned long  
    58 BIO_Delta_Length (unsigned long val) 
     57mg_u_long  
     58BIO_Delta_Length (mg_u_long val) 
    5959{ 
    60   register unsigned long num; 
     60  register mg_u_long num; 
    6161  DELTA_LENGTH (val, num); 
    6262  return (num); 
     
    6464 
    6565 
    66 unsigned long  
    67 BIO_Elias_Length (unsigned long val, unsigned long b, double s) 
     66mg_u_long  
     67BIO_Elias_Length (mg_u_long val, mg_u_long b, double s) 
    6868{ 
    69   register unsigned long num; 
     69  register mg_u_long num; 
    7070  ELIAS_LENGTH (val, b, s, num); 
    7171  return (num); 
    7272} 
    7373 
    74 unsigned long  
    75 BIO_Bblock_Length (unsigned long val, unsigned long b) 
     74mg_u_long  
     75BIO_Bblock_Length (mg_u_long val, mg_u_long b) 
    7676{ 
    77   register unsigned long num; 
     77  register mg_u_long num; 
    7878  BBLOCK_LENGTH (val, b, num); 
    7979  return (num); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_gen.h

    r16583 r25147  
    3333#define H_BITIO_GEN 
    3434 
    35 unsigned long BIO_Unary_Length (unsigned long val); 
     35mg_u_long BIO_Unary_Length (mg_u_long val); 
    3636 
    37 unsigned long BIO_Binary_Length (unsigned long val, unsigned long b); 
     37mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b); 
    3838 
    39 unsigned long BIO_Gamma_Length (unsigned long val); 
     39mg_u_long BIO_Gamma_Length (mg_u_long val); 
    4040 
    41 unsigned long BIO_Delta_Length (unsigned long val); 
     41mg_u_long BIO_Delta_Length (mg_u_long val); 
    4242 
    43 unsigned long BIO_Elias_Length (unsigned long val, unsigned long b, double s); 
     43mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s); 
    4444 
    45 unsigned long BIO_Bblock_Length (unsigned long val, unsigned long b); 
     45mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b); 
    4646 
    4747int BIO_Bblock_Init (int N, int p); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m.h

    r16583 r25147  
    5050#define POSITIVE(f, x)                          \ 
    5151  if ((x)<=0)                               \ 
    52     fprintf(stderr,"Error: Cannot "#f" encode %lu\n",(unsigned long)x),exit(1); 
     52    fprintf(stderr,"Error: Cannot "#f" encode %d\n",(mg_u_long)x),exit(1); 
    5353 
    5454 
     
    7575#define UNARY_ENCODE(x)                         \ 
    7676do {                                    \ 
    77   register unsigned long _B_x = (x);                    \ 
     77  register mg_u_long _B_x = (x);                    \ 
    7878  BIO_ENCODE_PROLOGUE;                          \ 
    7979  POSITIVE(unary, _B_x);                        \ 
     
    8585#define UNARY_ENCODE_L(x, count)                    \ 
    8686do {                                    \ 
    87   register unsigned long _B_x = (x);                    \ 
     87  register mg_u_long _B_x = (x);                    \ 
    8888  BIO_ENCODE_PROLOGUE;                          \ 
    8989  POSITIVE(unary, _B_x);                        \ 
     
    124124#define BINARY_ENCODE(x, b)                     \ 
    125125do {                                    \ 
    126   register unsigned long _B_x = (x);                    \ 
    127   register unsigned long _B_b = (b);                    \ 
     126  register mg_u_long _B_x = (x);                    \ 
     127  register mg_u_long _B_b = (b);                    \ 
    128128  register int _B_nbits, _B_logofb, _B_thresh;              \ 
    129129  BIO_ENCODE_PROLOGUE;                          \ 
     
    145145#define BINARY_ENCODE_L(x, b, count)                    \ 
    146146do {                                    \ 
    147   register unsigned long _B_x = (x);                    \ 
    148   register unsigned long _B_b = (b);                    \ 
     147  register mg_u_long _B_x = (x);                    \ 
     148  register mg_u_long _B_b = (b);                    \ 
    149149  register int _B_nbits, _B_logofb, _B_thresh;              \ 
    150150  BIO_ENCODE_PROLOGUE;                          \ 
     
    168168#define BINARY_DECODE(x, b)                     \ 
    169169do {                                    \ 
    170   register unsigned long _B_x = 0;                  \ 
    171   register unsigned long _B_b = (b);                    \ 
     170  register mg_u_long _B_x = 0;                  \ 
     171  register mg_u_long _B_b = (b);                    \ 
    172172  register int _B_i, _B_logofb, _B_thresh;              \ 
    173173  BIO_DECODE_PROLOGUE;                          \ 
     
    193193#define BINARY_DECODE_L(x, b, count)                    \ 
    194194do {                                    \ 
    195   register unsigned long _B_x = 0;                  \ 
    196   register unsigned long _B_b = (b);                    \ 
     195  register mg_u_long _B_x = 0;                  \ 
     196  register mg_u_long _B_b = (b);                    \ 
    197197  register int _B_i, _B_logofb, _B_thresh;              \ 
    198198  BIO_DECODE_PROLOGUE;                          \ 
     
    220220#define BINARY_LENGTH(x, b, count)                  \ 
    221221do {                                    \ 
    222   register unsigned long _B_x = (x);                    \ 
    223   register unsigned long _B_b = (b);                    \ 
     222  register mg_u_long _B_x = (x);                    \ 
     223  register mg_u_long _B_b = (b);                    \ 
    224224  register int _B_nbits, _B_logofb, _B_thresh;              \ 
    225225  POSITIVE(binary, _B_x);                       \ 
     
    240240#define GAMMA_ENCODE(x)                         \ 
    241241do {                                    \ 
    242   register unsigned long _B_xx = (x);                   \ 
     242  register mg_u_long _B_xx = (x);                   \ 
    243243  register int _B_logofb;                       \ 
    244244  register int _B_nbits;                        \ 
     
    255255#define GAMMA_ENCODE_L(x, count)                    \ 
    256256do {                                    \ 
    257   register unsigned long _B_xx = (x);                   \ 
     257  register mg_u_long _B_xx = (x);                   \ 
    258258  register int _B_logofb;                       \ 
    259259  register int _B_nbits;                        \ 
     
    271271#define GAMMA_DECODE(x)                         \ 
    272272do {                                    \ 
    273   register unsigned long _B_xx = 1;                 \ 
     273  register mg_u_long _B_xx = 1;                 \ 
    274274  register int _B_nbits = 0;                        \ 
    275275  BIO_DECODE_PROLOGUE;                          \ 
     
    283283#define GAMMA_DECODE_L(x, count)                    \ 
    284284do {                                    \ 
    285   register unsigned long _B_xx = 1;                 \ 
     285  register mg_u_long _B_xx = 1;                 \ 
    286286  register int _B_nbits = 0;                        \ 
    287287  BIO_DECODE_PROLOGUE;                          \ 
     
    296296#define GAMMA_LENGTH(x, count)                      \ 
    297297do {                                    \ 
    298   register unsigned long _B_xx = (x);                   \ 
     298  register mg_u_long _B_xx = (x);                   \ 
    299299  register int _B_logofb;                       \ 
    300300  POSITIVE(gamma, _B_xx);                       \ 
     
    310310#define DELTA_ENCODE(x)                         \ 
    311311do {                                    \ 
    312   register unsigned long _B_xxx = (x);                  \ 
     312  register mg_u_long _B_xxx = (x);                  \ 
    313313  register int _B_logx;                         \ 
    314314  FLOORLOG_2(_B_xxx, _B_logx);                      \ 
     
    319319#define DELTA_ENCODE_L(x, count)                    \ 
    320320do {                                    \ 
    321   register unsigned long _B_xxx = (x);                  \ 
     321  register mg_u_long _B_xxx = (x);                  \ 
    322322  register int _B_logx;                         \ 
    323323  FLOORLOG_2(_B_xxx, _B_logx);                      \ 
     
    329329#define DELTA_DECODE(x)                         \ 
    330330do {                                    \ 
    331   register unsigned long _B_xxx;                    \ 
     331  register mg_u_long _B_xxx;                    \ 
    332332  register int _B_logx;                         \ 
    333333  GAMMA_DECODE(_B_logx); --_B_logx;                 \ 
     
    338338#define DELTA_DECODE_L(x, count)                    \ 
    339339do {                                    \ 
    340   register unsigned long _B_xxx;                    \ 
     340  register mg_u_long _B_xxx;                    \ 
    341341  register int _B_logx;                         \ 
    342342  GAMMA_DECODE_L(_B_logx, count); --_B_logx;                \ 
     
    347347#define DELTA_LENGTH(x, count)                      \ 
    348348do {                                    \ 
    349   register unsigned long _B_xxx = (x);                  \ 
     349  register mg_u_long _B_xxx = (x);                  \ 
    350350  register int _B_logx, _B_dcount;                  \ 
    351351  FLOORLOG_2(_B_xxx, _B_logx);                      \ 
     
    363363#define ELIAS_ENCODE(x, b, s)                       \ 
    364364do {                                    \ 
    365   register unsigned long _B_xx = (x);                   \ 
    366   register unsigned long _B_b = (b);                    \ 
     365  register mg_u_long _B_xx = (x);                   \ 
     366  register mg_u_long _B_b = (b);                    \ 
    367367  register double _B_s = (s);                       \ 
    368368  register int _B_lower=1, _B_upper=1;                  \ 
     
    383383#define ELIAS_ENCODE_L(x, b, s, count)                  \ 
    384384do {                                    \ 
    385   register unsigned long _B_xx = (x);                   \ 
    386   register unsigned long _B_b = (b);                    \ 
     385  register mg_u_long _B_xx = (x);                   \ 
     386  register mg_u_long _B_b = (b);                    \ 
    387387  register double _B_s = (s);                       \ 
    388388  register int _B_lower=1, _B_upper=1;                  \ 
     
    403403#define ELIAS_DECODE(x, b, s)                       \ 
    404404do {                                    \ 
    405   register unsigned long _B_xx;                     \ 
    406   register unsigned long _B_b = (b);                    \ 
     405  register mg_u_long _B_xx;                     \ 
     406  register mg_u_long _B_b = (b);                    \ 
    407407  register double _B_s = (s);                       \ 
    408408  register int _B_lower=1, _B_upper=1;                  \ 
     
    423423#define ELIAS_DECODE_L(x, b, s, count)                  \ 
    424424do {                                    \ 
    425   register unsigned long _B_xx;                     \ 
    426   register unsigned long _B_b = (b);                    \ 
     425  register mg_u_long _B_xx;                     \ 
     426  register mg_u_long _B_b = (b);                    \ 
    427427  register double _B_s = (s);                       \ 
    428428  register int _B_lower=1, _B_upper=1;                  \ 
     
    443443#define ELIAS_LENGTH(x, b, s, count)                    \ 
    444444do {                                    \ 
    445   register unsigned long _B_xx = (x);                   \ 
    446   register unsigned long _B_b = (b);                    \ 
     445  register mg_u_long _B_xx = (x);                   \ 
     446  register mg_u_long _B_b = (b);                    \ 
    447447  register double _B_s = (s);                       \ 
    448448  register int _B_lower=1, _B_upper=1;                  \ 
     
    468468#define BBLOCK_ENCODE(x, b)                     \ 
    469469do {                                    \ 
    470   register unsigned long _B_xx = (x);                   \ 
    471   register unsigned long _B_bb = (b);                   \ 
     470  register mg_u_long _B_xx = (x);                   \ 
     471  register mg_u_long _B_bb = (b);                   \ 
    472472  register int _B_xdivb = 0;                        \ 
    473473  POSITIVE(bblock, _B_xx);                      \ 
     
    484484#define BBLOCK_ENCODE_L(x, b, count)                    \ 
    485485do {                                    \ 
    486   register unsigned long _B_xx = (x);                   \ 
    487   register unsigned long _B_bb = (b);                   \ 
     486  register mg_u_long _B_xx = (x);                   \ 
     487  register mg_u_long _B_bb = (b);                   \ 
    488488  register int _B_xdivb = 0;                        \ 
    489489  POSITIVE(bblock, _B_xx);                      \ 
     
    500500#define BBLOCK_DECODE(x, b)                     \ 
    501501do {                                    \ 
    502   register unsigned long _B_x1, _B_xx = 0;              \ 
    503   register unsigned long _B_bb = (b);                   \ 
     502  register mg_u_long _B_x1, _B_xx = 0;              \ 
     503  register mg_u_long _B_bb = (b);                   \ 
    504504  register int _B_xdivb;                        \ 
    505505  UNARY_DECODE(_B_xdivb); --_B_xdivb;                   \ 
     
    512512#define BBLOCK_DECODE_L(x, b, count)                    \ 
    513513do {                                    \ 
    514   register unsigned long _B_x1, _B_xx = 0;              \ 
    515   register unsigned long _B_bb = (b);                   \ 
     514  register mg_u_long _B_x1, _B_xx = 0;              \ 
     515  register mg_u_long _B_bb = (b);                   \ 
    516516  register int _B_xdivb;                        \ 
    517517  UNARY_DECODE_L(_B_xdivb, count); --_B_xdivb;              \ 
     
    524524#define BBLOCK_LENGTH(x, b, count)                  \ 
    525525do {                                    \ 
    526   register unsigned long _B_bcount, _B_xx = (x);            \ 
    527   register unsigned long _B_bb = (b);                   \ 
     526  register mg_u_long _B_bcount, _B_xx = (x);            \ 
     527  register mg_u_long _B_bb = (b);                   \ 
    528528  register int _B_xdivb = 0;                        \ 
    529529  POSITIVE(bblock, _B_xx);                      \ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h

    r16583 r25147  
    3636  { 
    3737    unsigned char *Base; 
    38     unsigned long pos; 
     38    mg_u_long pos; 
    3939  } 
    4040mems_bitio_state; 
     
    4444  {                                 \ 
    4545    register unsigned char *__base = b;                 \ 
    46     register unsigned long __pos = p; 
     46    register mg_u_long __pos = p; 
    4747 
    4848#define ENCODE_CONTINUE(b)                      \ 
    4949  {                                 \ 
    5050    register unsigned char *__base = (b).Base;              \ 
    51     register unsigned long __pos = (b).pos; 
     51    register mg_u_long __pos = (b).pos; 
    5252 
    5353#define ENCODE_BIT(b)                           \ 
     
    7676  {                                 \ 
    7777    register unsigned char *__base = b;                 \ 
    78     register unsigned long __pos = p; 
     78    register mg_u_long __pos = p; 
    7979 
    8080#define DECODE_CONTINUE(b)                      \ 
    8181  {                                 \ 
    8282    register unsigned char *__base = (b).Base;              \ 
    83     register unsigned long __pos = (b).pos; 
     83    register mg_u_long __pos = (b).pos; 
    8484 
    8585#define DECODE_ADD_FF(b)                        \ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_random.h

    r16583 r25147  
    3838    FILE *File; 
    3939    unsigned char *Buf; 
    40     unsigned long Base; 
    41     unsigned long Used; 
    42     unsigned long pos; 
    43     unsigned long len; 
    44     unsigned long sft; 
     40    mg_u_long Base; 
     41    mg_u_long Used; 
     42    mg_u_long pos; 
     43    mg_u_long len; 
     44    mg_u_long sft; 
    4545  } 
    4646random_bitio_state; 
     
    5151    register FILE *__file = f;                      \ 
    5252    register unsigned char *__buf;                  \ 
    53     register unsigned long __pos = 0;                   \ 
    54     register unsigned long __base = 0;                  \ 
    55     register unsigned long __is_used = 0;                   \ 
    56     register unsigned long __len = (l)-1;               \ 
    57     register unsigned long __sft = 0;                   \ 
     53    register mg_u_long __pos = 0;                   \ 
     54    register mg_u_long __base = 0;                  \ 
     55    register mg_u_long __is_used = 0;                   \ 
     56    register mg_u_long __len = (l)-1;               \ 
     57    register mg_u_long __sft = 0;                   \ 
    5858    while (__len) { ++__sft; __len >>=1; }              \ 
    5959    __len = 1<<__sft;                           \ 
     
    6666    register FILE *__file = (b).File;                   \ 
    6767    register unsigned char *__buf = (b).Buf;                \ 
    68     register unsigned long __pos = (b).pos;             \ 
    69     register unsigned long __base = (b).Base;               \ 
    70     register unsigned long __is_used = (b).Used;                \ 
    71     register unsigned long __len = (b).len;             \ 
    72     register unsigned long __sft = (b).sft; 
     68    register mg_u_long __pos = (b).pos;             \ 
     69    register mg_u_long __base = (b).Base;               \ 
     70    register mg_u_long __is_used = (b).Used;                \ 
     71    register mg_u_long __len = (b).len;             \ 
     72    register mg_u_long __sft = (b).sft; 
    7373 
    7474#define SEEK fprintf(stderr, "Seek to %d\n",__base) 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mem.c

    r16583 r25147  
    5555 
    5656void  
    57 BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs, 
    58               unsigned long *bits) 
     57BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs, 
     58              mg_u_long *bits) 
    5959{ 
    6060  ENCODE_CONTINUE (*bs) 
     
    6767 
    6868 
    69 unsigned long  
     69mg_u_long  
    7070BIO_Mem_Unary_Decode (mem_bitio_state * bs, 
    71               unsigned long *bits) 
    72 { 
    73   register unsigned long val; 
     71              mg_u_long *bits) 
     72{ 
     73  register mg_u_long val; 
    7474  DECODE_CONTINUE (*bs) 
    7575    if (bits) 
     
    8888 
    8989void  
    90 BIO_Mem_Binary_Encode (unsigned long val, unsigned long b, 
    91                mem_bitio_state * bs, unsigned long *bits) 
     90BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b, 
     91               mem_bitio_state * bs, mg_u_long *bits) 
    9292{ 
    9393  ENCODE_CONTINUE (*bs) 
     
    100100 
    101101 
    102 unsigned long  
    103 BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs, 
    104                unsigned long *bits) 
    105 { 
    106   register unsigned long val; 
     102mg_u_long  
     103BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs, 
     104               mg_u_long *bits) 
     105{ 
     106  register mg_u_long val; 
    107107  DECODE_CONTINUE (*bs) 
    108108    if (bits) 
     
    121121 
    122122void  
    123 BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs, 
    124               unsigned long *bits) 
     123BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs, 
     124              mg_u_long *bits) 
    125125{ 
    126126  ENCODE_CONTINUE (*bs) 
     
    133133 
    134134 
    135 unsigned long  
    136 BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits) 
    137 { 
    138   register unsigned long val; 
     135mg_u_long  
     136BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits) 
     137{ 
     138  register mg_u_long val; 
    139139  DECODE_CONTINUE (*bs) 
    140140    if (bits) 
     
    150150 
    151151void  
    152 BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs, 
    153               unsigned long *bits) 
     152BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs, 
     153              mg_u_long *bits) 
    154154{ 
    155155  ENCODE_CONTINUE (*bs) 
     
    162162 
    163163 
    164 unsigned long  
    165 BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits) 
    166 { 
    167   register unsigned long val; 
     164mg_u_long  
     165BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits) 
     166{ 
     167  register mg_u_long val; 
    168168  DECODE_CONTINUE (*bs) 
    169169    if (bits) 
     
    176176 
    177177void  
    178 BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s, 
    179               mem_bitio_state * bs, unsigned long *bits) 
     178BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     179              mem_bitio_state * bs, mg_u_long *bits) 
    180180{ 
    181181  ENCODE_CONTINUE (*bs) 
     
    188188 
    189189 
    190 unsigned long  
    191 BIO_Mem_Elias_Decode (unsigned long b, double s, 
    192               mem_bitio_state * bs, unsigned long *bits) 
    193 { 
    194   register unsigned long val; 
     190mg_u_long  
     191BIO_Mem_Elias_Decode (mg_u_long b, double s, 
     192              mem_bitio_state * bs, mg_u_long *bits) 
     193{ 
     194  register mg_u_long val; 
    195195  DECODE_CONTINUE (*bs) 
    196196    if (bits) 
     
    203203 
    204204void  
    205 BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b, 
    206                mem_bitio_state * bs, unsigned long *bits) 
     205BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b, 
     206               mem_bitio_state * bs, mg_u_long *bits) 
    207207{ 
    208208  ENCODE_CONTINUE (*bs) 
     
    215215 
    216216 
    217 unsigned long  
    218 BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs, 
    219                unsigned long *bits) 
    220 { 
    221   register unsigned long val; 
     217mg_u_long  
     218BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs, 
     219               mg_u_long *bits) 
     220{ 
     221  register mg_u_long val; 
    222222  DECODE_CONTINUE (*bs) 
    223223    if (bits) 
     
    230230 
    231231void  
    232 BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs) 
     232BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs) 
    233233{ 
    234234  DECODE_CONTINUE (*bs) 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mem.h

    r16583 r25147  
    6161 
    6262 
    63 void BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs, 
    64                unsigned long *bits); 
    65 unsigned long BIO_Mem_Unary_Decode (mem_bitio_state * bs, 
    66                     unsigned long *bits); 
     63void BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs, 
     64               mg_u_long *bits); 
     65mg_u_long BIO_Mem_Unary_Decode (mem_bitio_state * bs, 
     66                    mg_u_long *bits); 
    6767 
    6868 
    6969 
    70 void BIO_Mem_Binary_Encode (unsigned long val, unsigned long b, 
    71                 mem_bitio_state * bs, unsigned long *bits); 
    72 unsigned long BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs, 
    73                      unsigned long *bits); 
     70void BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b, 
     71                mem_bitio_state * bs, mg_u_long *bits); 
     72mg_u_long BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs, 
     73                     mg_u_long *bits); 
    7474 
    7575 
    7676 
    77 void BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs, 
    78                unsigned long *bits); 
    79 unsigned long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits); 
     77void BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs, 
     78               mg_u_long *bits); 
     79mg_u_long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits); 
    8080 
    8181 
    8282 
    83 void BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs, 
    84                unsigned long *bits); 
    85 unsigned long BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits); 
     83void BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs, 
     84               mg_u_long *bits); 
     85mg_u_long BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits); 
    8686 
    8787 
    88 void BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s, 
    89                mem_bitio_state * bs, unsigned long *bits); 
    90 unsigned long BIO_Mem_Elias_Decode (unsigned long b, double s, 
    91                  mem_bitio_state * bs, unsigned long *bits); 
     88void BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     89               mem_bitio_state * bs, mg_u_long *bits); 
     90mg_u_long BIO_Mem_Elias_Decode (mg_u_long b, double s, 
     91                 mem_bitio_state * bs, mg_u_long *bits); 
    9292 
    9393 
    94 void BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b, 
    95                 mem_bitio_state * bs, unsigned long *bits); 
    96 unsigned long BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs, 
    97                      unsigned long *bits); 
     94void BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b, 
     95                mem_bitio_state * bs, mg_u_long *bits); 
     96mg_u_long BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs, 
     97                     mg_u_long *bits); 
    9898 
    9999 
    100 void BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs); 
     100void BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs); 
    101101 
    102102 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.c

    r16583 r25147  
    3030 
    3131void  
    32 BIO_Mems_Encode_Start (unsigned char *buf, unsigned long pos, 
     32BIO_Mems_Encode_Start (unsigned char *buf, mg_u_long pos, 
    3333               mems_bitio_state * bs) 
    3434{ 
     
    4646 
    4747void  
    48 BIO_Mems_Decode_Start (unsigned char *buf, unsigned long pos, 
     48BIO_Mems_Decode_Start (unsigned char *buf, mg_u_long pos, 
    4949               mems_bitio_state * bs) 
    5050{ 
     
    5757 
    5858void  
    59 BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs, 
    60                unsigned long *bits) 
     59BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs, 
     60               mg_u_long *bits) 
    6161{ 
    6262  ENCODE_CONTINUE (*bs) 
     
    6969 
    7070 
    71 unsigned long  
     71mg_u_long  
    7272BIO_Mems_Unary_Decode (mems_bitio_state * bs, 
    73                unsigned long *bits) 
    74 { 
    75   register unsigned long val; 
     73               mg_u_long *bits) 
     74{ 
     75  register mg_u_long val; 
    7676  DECODE_CONTINUE (*bs) 
    7777    if (bits) 
     
    9090 
    9191void  
    92 BIO_Mems_Binary_Encode (unsigned long val, unsigned long b, 
    93             mems_bitio_state * bs, unsigned long *bits) 
     92BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b, 
     93            mems_bitio_state * bs, mg_u_long *bits) 
    9494{ 
    9595  ENCODE_CONTINUE (*bs) 
     
    102102 
    103103 
    104 unsigned long  
    105 BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs, 
    106             unsigned long *bits) 
    107 { 
    108   register unsigned long val; 
     104mg_u_long  
     105BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs, 
     106            mg_u_long *bits) 
     107{ 
     108  register mg_u_long val; 
    109109  DECODE_CONTINUE (*bs) 
    110110    if (bits) 
     
    123123 
    124124void  
    125 BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs, 
    126                unsigned long *bits) 
     125BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs, 
     126               mg_u_long *bits) 
    127127{ 
    128128  ENCODE_CONTINUE (*bs) 
     
    135135 
    136136 
    137 unsigned long  
    138 BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits) 
    139 { 
    140   register unsigned long val; 
     137mg_u_long  
     138BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits) 
     139{ 
     140  register mg_u_long val; 
    141141  DECODE_CONTINUE (*bs) 
    142142    if (bits) 
     
    152152 
    153153void  
    154 BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs, 
    155                unsigned long *bits) 
     154BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs, 
     155               mg_u_long *bits) 
    156156{ 
    157157  ENCODE_CONTINUE (*bs) 
     
    164164 
    165165 
    166 unsigned long  
    167 BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits) 
    168 { 
    169   register unsigned long val; 
     166mg_u_long  
     167BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits) 
     168{ 
     169  register mg_u_long val; 
    170170  DECODE_CONTINUE (*bs) 
    171171    if (bits) 
     
    178178 
    179179void  
    180 BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s, 
    181                mems_bitio_state * bs, unsigned long *bits) 
     180BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     181               mems_bitio_state * bs, mg_u_long *bits) 
    182182{ 
    183183  ENCODE_CONTINUE (*bs) 
     
    190190 
    191191 
    192 unsigned long  
    193 BIO_Mems_Elias_Decode (unsigned long b, double s, 
    194                mems_bitio_state * bs, unsigned long *bits) 
    195 { 
    196   register unsigned long val; 
     192mg_u_long  
     193BIO_Mems_Elias_Decode (mg_u_long b, double s, 
     194               mems_bitio_state * bs, mg_u_long *bits) 
     195{ 
     196  register mg_u_long val; 
    197197  DECODE_CONTINUE (*bs) 
    198198    if (bits) 
     
    205205 
    206206void  
    207 BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b, 
    208             mems_bitio_state * bs, unsigned long *bits) 
     207BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b, 
     208            mems_bitio_state * bs, mg_u_long *bits) 
    209209{ 
    210210  ENCODE_CONTINUE (*bs) 
     
    217217 
    218218 
    219 unsigned long  
    220 BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs, 
    221             unsigned long *bits) 
    222 { 
    223   register unsigned long val; 
     219mg_u_long  
     220BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs, 
     221            mg_u_long *bits) 
     222{ 
     223  register mg_u_long val; 
    224224  DECODE_CONTINUE (*bs) 
    225225    if (bits) 
     
    232232 
    233233void  
    234 BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs) 
     234BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs) 
    235235{ 
    236236  DECODE_CONTINUE (*bs) 
     
    240240 
    241241void  
    242 BIO_Mems_Encode_Seek (unsigned long pos, mems_bitio_state * bs) 
     242BIO_Mems_Encode_Seek (mg_u_long pos, mems_bitio_state * bs) 
    243243{ 
    244244  ENCODE_CONTINUE (*bs) 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.h

    r16583 r25147  
    3838  { 
    3939    unsigned char *Base; 
    40     unsigned long pos; 
     40    mg_u_long pos; 
    4141  } 
    4242mems_bitio_state; 
     
    4646 
    4747 
    48 void BIO_Mems_Encode_Start (char *buf, unsigned long pos, mems_bitio_state * bs); 
     48void BIO_Mems_Encode_Start (char *buf, mg_u_long pos, mems_bitio_state * bs); 
    4949void BIO_Mems_Encode_Done (mems_bitio_state * bs); 
    5050 
    5151 
    5252 
    53 void BIO_Mems_Decode_Start (void *buf, unsigned long pos, mems_bitio_state * bs); 
     53void BIO_Mems_Decode_Start (void *buf, mg_u_long pos, mems_bitio_state * bs); 
    5454 
    5555 
    5656 
    57 void BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs, 
    58                 unsigned long *bits); 
    59 unsigned long BIO_Mems_Unary_Decode (mems_bitio_state * bs, 
    60                      unsigned long *bits); 
     57void BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs, 
     58                mg_u_long *bits); 
     59mg_u_long BIO_Mems_Unary_Decode (mems_bitio_state * bs, 
     60                     mg_u_long *bits); 
    6161 
    6262 
    6363 
    64 void BIO_Mems_Binary_Encode (unsigned long val, unsigned long b, 
    65                  mems_bitio_state * bs, unsigned long *bits); 
    66 unsigned long BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs, 
    67                       unsigned long *bits); 
     64void BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b, 
     65                 mems_bitio_state * bs, mg_u_long *bits); 
     66mg_u_long BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs, 
     67                      mg_u_long *bits); 
    6868 
    6969 
    7070 
    71 void BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs, 
    72                 unsigned long *bits); 
    73 unsigned long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits); 
     71void BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs, 
     72                mg_u_long *bits); 
     73mg_u_long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits); 
    7474 
    7575 
    7676 
    77 void BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs, 
    78                 unsigned long *bits); 
    79 unsigned long BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits); 
     77void BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs, 
     78                mg_u_long *bits); 
     79mg_u_long BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits); 
    8080 
    8181 
    82 void BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s, 
    83                 mems_bitio_state * bs, unsigned long *bits); 
    84 unsigned long BIO_Mems_Elias_Decode (unsigned long b, double s, 
    85                 mems_bitio_state * bs, unsigned long *bits); 
     82void BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     83                mems_bitio_state * bs, mg_u_long *bits); 
     84mg_u_long BIO_Mems_Elias_Decode (mg_u_long b, double s, 
     85                mems_bitio_state * bs, mg_u_long *bits); 
    8686 
    8787 
    88 void BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b, 
    89                  mems_bitio_state * bs, unsigned long *bits); 
    90 unsigned long BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs, 
    91                       unsigned long *bits); 
     88void BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b, 
     89                 mems_bitio_state * bs, mg_u_long *bits); 
     90mg_u_long BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs, 
     91                      mg_u_long *bits); 
    9292 
    9393 
    94 void BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs); 
     94void BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs); 
    9595 
    9696 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.c

    r16583 r25147  
    3030 
    3131void  
    32 BIO_Random_Start (FILE * f, unsigned long len, 
     32BIO_Random_Start (FILE * f, mg_u_long len, 
    3333          random_bitio_state * bs) 
    3434{ 
     
    6464 
    6565void  
    66 BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs, 
    67              unsigned long *bits) 
     66BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs, 
     67             mg_u_long *bits) 
    6868{ 
    6969  ENCODE_CONTINUE (*bs) 
     
    7676 
    7777 
    78 unsigned long  
     78mg_u_long  
    7979BIO_Random_Unary_Decode (random_bitio_state * bs, 
    80              unsigned long *bits) 
    81 { 
    82   register unsigned long val; 
     80             mg_u_long *bits) 
     81{ 
     82  register mg_u_long val; 
    8383  DECODE_CONTINUE (*bs) 
    8484    if (bits) 
     
    9797 
    9898void  
    99 BIO_Random_Binary_Encode (unsigned long val, unsigned long b, 
    100               random_bitio_state * bs, unsigned long *bits) 
     99BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b, 
     100              random_bitio_state * bs, mg_u_long *bits) 
    101101{ 
    102102  ENCODE_CONTINUE (*bs) 
     
    109109 
    110110 
    111 unsigned long  
    112 BIO_Random_Binary_Decode (unsigned long b, 
     111mg_u_long  
     112BIO_Random_Binary_Decode (mg_u_long b, 
    113113              random_bitio_state * bs, 
    114               unsigned long *bits) 
    115 { 
    116   register unsigned long val; 
     114              mg_u_long *bits) 
     115{ 
     116  register mg_u_long val; 
    117117  DECODE_CONTINUE (*bs) 
    118118    if (bits) 
     
    131131 
    132132void  
    133 BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs, 
    134              unsigned long *bits) 
     133BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs, 
     134             mg_u_long *bits) 
    135135{ 
    136136  ENCODE_CONTINUE (*bs) 
     
    143143 
    144144 
    145 unsigned long  
     145mg_u_long  
    146146BIO_Random_Gamma_Decode (random_bitio_state * bs, 
    147              unsigned long *bits) 
    148 { 
    149   register unsigned long val; 
     147             mg_u_long *bits) 
     148{ 
     149  register mg_u_long val; 
    150150  DECODE_CONTINUE (*bs) 
    151151    if (bits) 
     
    161161 
    162162void  
    163 BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs, 
    164              unsigned long *bits) 
     163BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs, 
     164             mg_u_long *bits) 
    165165{ 
    166166  ENCODE_CONTINUE (*bs) 
     
    173173 
    174174 
    175 unsigned long  
     175mg_u_long  
    176176BIO_Random_Delta_Decode (random_bitio_state * bs, 
    177              unsigned long *bits) 
    178 { 
    179   register unsigned long val; 
     177             mg_u_long *bits) 
     178{ 
     179  register mg_u_long val; 
    180180  DECODE_CONTINUE (*bs) 
    181181    if (bits) 
     
    188188 
    189189void  
    190 BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s, 
    191              random_bitio_state * bs, unsigned long *bits) 
     190BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     191             random_bitio_state * bs, mg_u_long *bits) 
    192192{ 
    193193  ENCODE_CONTINUE (*bs) 
     
    200200 
    201201 
    202 unsigned long  
    203 BIO_Random_Elias_Decode (unsigned long b, double s, 
     202mg_u_long  
     203BIO_Random_Elias_Decode (mg_u_long b, double s, 
    204204             random_bitio_state * bs, 
    205              unsigned long *bits) 
    206 { 
    207   register unsigned long val; 
     205             mg_u_long *bits) 
     206{ 
     207  register mg_u_long val; 
    208208  DECODE_CONTINUE (*bs) 
    209209    if (bits) 
     
    216216 
    217217void  
    218 BIO_Random_Bblock_Encode (unsigned long val, unsigned long b, 
    219               random_bitio_state * bs, unsigned long *bits) 
     218BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b, 
     219              random_bitio_state * bs, mg_u_long *bits) 
    220220{ 
    221221  ENCODE_CONTINUE (*bs) 
     
    228228 
    229229 
    230 unsigned long  
    231 BIO_Random_Bblock_Decode (unsigned long b, 
     230mg_u_long  
     231BIO_Random_Bblock_Decode (mg_u_long b, 
    232232              random_bitio_state * bs, 
    233               unsigned long *bits) 
    234 { 
    235   register unsigned long val; 
     233              mg_u_long *bits) 
     234{ 
     235  register mg_u_long val; 
    236236  DECODE_CONTINUE (*bs) 
    237237    if (bits) 
     
    244244 
    245245void  
    246 BIO_Random_Seek (unsigned long pos, random_bitio_state * bs) 
     246BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs) 
    247247{ 
    248248  ENCODE_CONTINUE (*bs) 
     
    258258} 
    259259 
    260 unsigned long  
     260mg_u_long  
    261261BIO_Random_Tell (random_bitio_state * bs) 
    262262{ 
    263   register unsigned long t; 
     263  register mg_u_long t; 
    264264  ENCODE_CONTINUE (*bs) 
    265265    t = ENCODE_TELL; 
     
    278278    ((((pos)+7) >> 3) < (mg_ullong)(__base + __len))) 
    279279      { 
    280     __pos = (long)((pos) - (mg_ullong)(__base << 3)); 
     280    __pos = (mg_s_long)((pos) - (mg_ullong)(__base << 3)); 
    281281      } 
    282282    else 
    283283      { 
    284284        ENCODE_FLUSH; 
    285     __base = (long)(((pos) >> (__sft+3)) << __sft); 
     285    __base = (mg_s_long)(((pos) >> (__sft+3)) << __sft); 
    286286     
    287287    fseek(__file,__base,0); 
    288288    fread(__buf,1,__len,__file); 
    289     __pos = (long)((pos) & ((8 << __sft)-1)); 
     289    __pos = (mg_s_long)((pos) & ((8 << __sft)-1)); 
    290290      } 
    291291   
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.h

    r16583 r25147  
    4343    FILE *File; 
    4444    unsigned char *Buf; 
    45     unsigned long Base; 
    46     unsigned long Used; 
    47     unsigned long pos; 
    48     unsigned long len; 
    49     unsigned long sft; 
     45    mg_u_long Base; 
     46    mg_u_long Used; 
     47    mg_u_long pos; 
     48    mg_u_long len; 
     49    mg_u_long sft; 
    5050  } 
    5151random_bitio_state; 
     
    5555 
    5656 
    57 void BIO_Random_Start (FILE * f, unsigned long len, 
     57void BIO_Random_Start (FILE * f, mg_u_long len, 
    5858               random_bitio_state * bs); 
    5959void BIO_Random_Done (random_bitio_state * bs); 
     
    6161 
    6262 
    63 void BIO_Random_Decode_Start (void *buf, unsigned long pos, 
     63void BIO_Random_Decode_Start (void *buf, mg_u_long pos, 
    6464                  random_bitio_state * bs); 
    6565 
     
    6969 
    7070 
    71 void BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs, 
    72                   unsigned long *bits); 
    73 unsigned long BIO_Random_Unary_Decode (random_bitio_state * bs, 
    74                        unsigned long *bits); 
     71void BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs, 
     72                  mg_u_long *bits); 
     73mg_u_long BIO_Random_Unary_Decode (random_bitio_state * bs, 
     74                       mg_u_long *bits); 
    7575 
    7676 
    7777 
    78 void BIO_Random_Binary_Encode (unsigned long val, unsigned long b, 
    79                    random_bitio_state * bs, unsigned long *bits); 
    80 unsigned long BIO_Random_Binary_Decode (unsigned long b, random_bitio_state * bs, 
    81                     unsigned long *bits); 
     78void BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b, 
     79                   random_bitio_state * bs, mg_u_long *bits); 
     80mg_u_long BIO_Random_Binary_Decode (mg_u_long b, random_bitio_state * bs, 
     81                    mg_u_long *bits); 
    8282 
    8383 
    8484 
    85 void BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs, 
    86                   unsigned long *bits); 
    87 unsigned long BIO_Random_Gamma_Decode (random_bitio_state * bs, 
    88                        unsigned long *bits); 
     85void BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs, 
     86                  mg_u_long *bits); 
     87mg_u_long BIO_Random_Gamma_Decode (random_bitio_state * bs, 
     88                       mg_u_long *bits); 
    8989 
    9090 
    9191 
    92 void BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs, 
    93                   unsigned long *bits); 
    94 unsigned long BIO_Random_Delta_Decode (random_bitio_state * bs, 
    95                        unsigned long *bits); 
     92void BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs, 
     93                  mg_u_long *bits); 
     94mg_u_long BIO_Random_Delta_Decode (random_bitio_state * bs, 
     95                       mg_u_long *bits); 
    9696 
    9797 
    98 void BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s, 
    99                   random_bitio_state * bs, unsigned long *bits); 
    100 unsigned long BIO_Random_Elias_Decode (unsigned long b, double s, 
     98void BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     99                  random_bitio_state * bs, mg_u_long *bits); 
     100mg_u_long BIO_Random_Elias_Decode (mg_u_long b, double s, 
    101101                       random_bitio_state * bs, 
    102                        unsigned long *bits); 
     102                       mg_u_long *bits); 
    103103 
    104104 
    105 void BIO_Random_Bblock_Encode (unsigned long val, unsigned long b, 
    106                    random_bitio_state * bs, unsigned long *bits); 
    107 unsigned long BIO_Random_Bblock_Decode (unsigned long b, 
     105void BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b, 
     106                   random_bitio_state * bs, mg_u_long *bits); 
     107mg_u_long BIO_Random_Bblock_Decode (mg_u_long b, 
    108108                    random_bitio_state * bs, 
    109                     unsigned long *bits); 
     109                    mg_u_long *bits); 
    110110 
    111111 
    112 void BIO_Random_Seek (unsigned long pos, random_bitio_state * bs); 
     112void BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs); 
    113113 
    114114void BIO_Random_Flush (random_bitio_state * bs); 
    115115 
    116 unsigned long BIO_Random_Tell (random_bitio_state * bs); 
     116mg_u_long BIO_Random_Tell (random_bitio_state * bs); 
    117117 
    118118#ifdef USE_LONG_LONG 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_stdio.c

    r16583 r25147  
    7272 
    7373void  
    74 BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs, 
    75             unsigned long *bits) 
     74BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs, 
     75            mg_u_long *bits) 
    7676{ 
    7777  ENCODE_CONTINUE (*bs) 
     
    8484 
    8585 
    86 unsigned long  
     86mg_u_long  
    8787BIO_Stdio_Unary_Decode (stdio_bitio_state * bs, 
    88             unsigned long *bits) 
    89 { 
    90   register unsigned long val; 
     88            mg_u_long *bits) 
     89{ 
     90  register mg_u_long val; 
    9191  DECODE_CONTINUE (*bs) 
    9292    if (bits) 
     
    105105 
    106106void  
    107 BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b, 
    108              stdio_bitio_state * bs, unsigned long *bits) 
     107BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b, 
     108             stdio_bitio_state * bs, mg_u_long *bits) 
    109109{ 
    110110  ENCODE_CONTINUE (*bs) 
     
    117117 
    118118 
    119 unsigned long  
    120 BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs, 
    121              unsigned long *bits) 
    122 { 
    123   register unsigned long val; 
     119mg_u_long  
     120BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs, 
     121             mg_u_long *bits) 
     122{ 
     123  register mg_u_long val; 
    124124  DECODE_CONTINUE (*bs) 
    125125    if (bits) 
     
    138138 
    139139void  
    140 BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs, 
    141             unsigned long *bits) 
     140BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs, 
     141            mg_u_long *bits) 
    142142{ 
    143143  ENCODE_CONTINUE (*bs) 
     
    150150 
    151151 
    152 unsigned long  
     152mg_u_long  
    153153BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs, 
    154             unsigned long *bits) 
    155 { 
    156   register unsigned long val; 
     154            mg_u_long *bits) 
     155{ 
     156  register mg_u_long val; 
    157157  DECODE_CONTINUE (*bs) 
    158158    if (bits) 
     
    168168 
    169169void  
    170 BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs, 
    171             unsigned long *bits) 
     170BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs, 
     171            mg_u_long *bits) 
    172172{ 
    173173  ENCODE_CONTINUE (*bs) 
     
    180180 
    181181 
    182 unsigned long  
     182mg_u_long  
    183183BIO_Stdio_Delta_Decode (stdio_bitio_state * bs, 
    184             unsigned long *bits) 
    185 { 
    186   register unsigned long val; 
     184            mg_u_long *bits) 
     185{ 
     186  register mg_u_long val; 
    187187  DECODE_CONTINUE (*bs) 
    188188    if (bits) 
     
    198198 
    199199void  
    200 BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s, 
    201             stdio_bitio_state * bs, unsigned long *bits) 
     200BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     201            stdio_bitio_state * bs, mg_u_long *bits) 
    202202{ 
    203203  ENCODE_CONTINUE (*bs) 
     
    210210 
    211211 
    212 unsigned long  
    213 BIO_Stdio_Elias_Decode (unsigned long b, double s, 
     212mg_u_long  
     213BIO_Stdio_Elias_Decode (mg_u_long b, double s, 
    214214            stdio_bitio_state * bs, 
    215             unsigned long *bits) 
    216 { 
    217   register unsigned long val; 
     215            mg_u_long *bits) 
     216{ 
     217  register mg_u_long val; 
    218218  DECODE_CONTINUE (*bs) 
    219219    if (bits) 
     
    228228 
    229229void  
    230 BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b, 
    231              stdio_bitio_state * bs, unsigned long *bits) 
     230BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b, 
     231             stdio_bitio_state * bs, mg_u_long *bits) 
    232232{ 
    233233  ENCODE_CONTINUE (*bs) 
     
    240240 
    241241 
    242 unsigned long  
    243 BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs, 
    244              unsigned long *bits) 
    245 { 
    246   register unsigned long val; 
     242mg_u_long  
     243BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs, 
     244             mg_u_long *bits) 
     245{ 
     246  register mg_u_long val; 
    247247  DECODE_CONTINUE (*bs) 
    248248    if (bits) 
     
    255255 
    256256void  
    257 BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs) 
     257BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs) 
    258258{ 
    259259  DECODE_CONTINUE (*bs) 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_stdio.h

    r16583 r25147  
    5959 
    6060 
    61 void BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs, 
    62                  unsigned long *bits); 
    63 unsigned long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs, 
    64                       unsigned long *bits); 
     61void BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs, 
     62                 mg_u_long *bits); 
     63mg_u_long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs, 
     64                      mg_u_long *bits); 
    6565 
    6666 
    6767 
    68 void BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b, 
    69                   stdio_bitio_state * bs, unsigned long *bits); 
    70 unsigned long BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs, 
    71                        unsigned long *bits); 
     68void BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b, 
     69                  stdio_bitio_state * bs, mg_u_long *bits); 
     70mg_u_long BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs, 
     71                       mg_u_long *bits); 
    7272 
    7373 
    7474 
    75 void BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs, 
    76                  unsigned long *bits); 
    77 unsigned long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs, 
    78                       unsigned long *bits); 
     75void BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs, 
     76                 mg_u_long *bits); 
     77mg_u_long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs, 
     78                      mg_u_long *bits); 
    7979 
    8080 
    8181 
    82 void BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs, 
    83                  unsigned long *bits); 
    84 unsigned long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs, 
    85                       unsigned long *bits); 
     82void BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs, 
     83                 mg_u_long *bits); 
     84mg_u_long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs, 
     85                      mg_u_long *bits); 
    8686 
    8787 
    8888 
    89 void BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s, 
    90                  stdio_bitio_state * bs, unsigned long *bits); 
    91 unsigned long BIO_Stdio_Elias_Decode (unsigned long b, double s, 
     89void BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s, 
     90                 stdio_bitio_state * bs, mg_u_long *bits); 
     91mg_u_long BIO_Stdio_Elias_Decode (mg_u_long b, double s, 
    9292                      stdio_bitio_state * bs, 
    93                       unsigned long *bits); 
     93                      mg_u_long *bits); 
    9494 
    9595 
    96 void BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b, 
    97                   stdio_bitio_state * bs, unsigned long *bits); 
    98 unsigned long BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs, 
    99                        unsigned long *bits); 
     96void BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b, 
     97                  stdio_bitio_state * bs, mg_u_long *bits); 
     98mg_u_long BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs, 
     99                       mg_u_long *bits); 
    100100 
    101101 
    102 void BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs); 
     102void BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs); 
    103103 
    104104#endif 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/filestats.c

    r16583 r25147  
    2828 
    2929File * 
    30 Fopen (char *name, char *mode, unsigned long magic) 
     30Fopen (char *name, char *mode, mg_u_long magic) 
    3131{ 
    3232  FILE *f; 
    3333  File *F; 
    34   unsigned long m; 
     34  mg_u_long m; 
    3535  if (!(f = fopen (name, mode))) 
    3636    return (NULL); 
     
    9090 
    9191int  
    92 Fseek (File * F, long offset, int ptrname) 
     92Fseek (File * F, mg_s_long offset, int ptrname) 
    9393{ 
    9494  int num; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/filestats.h

    r16583 r25147  
    2323#define H_FILESTATS 
    2424 
     25#include "mglong.h" 
    2526 
    2627typedef struct FileStats 
    2728  { 
    28     unsigned long NumSeeks; 
    29     unsigned long NumReads; 
    30     unsigned long NumBytes; 
     29    mg_u_long NumSeeks; 
     30    mg_u_long NumReads; 
     31    mg_u_long NumBytes; 
    3132  } 
    3233FileStats; 
     
    4546 
    4647/* if magic is 0 no magic number is read or written */ 
    47 File *Fopen (char *name, char *mode, unsigned long magic); 
     48File *Fopen (char *name, char *mode, mg_u_long magic); 
    4849 
    4950size_t Fread (void *ptr, size_t size, size_t nitems, File * F); 
    5051 
    51 int Fseek (File * F, long offset, int ptrname); 
     52int Fseek (File * F, mg_s_long offset, int ptrname); 
    5253 
    5354void Rewind (File * F); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/gmalloc.c

    r16583 r25147  
    401401{ 
    402402  __ptr_t result; 
    403   unsigned long int adj; 
     403  mg_u_long adj; 
    404404 
    405405  result = (*__morecore) (size); 
    406   adj = (unsigned long int) ((unsigned long int) ((char *) result - 
     406  adj = (mg_u_long) ((mg_u_long) ((char *) result - 
    407407                          (char *) NULL)) % BLOCKSIZE; 
    408408  if (adj != 0) 
     
    549549      block = BLOCK (result); 
    550550      if (--_heapinfo[block].busy.info.frag.nfree != 0) 
    551         _heapinfo[block].busy.info.frag.first = (unsigned long int) 
    552           ((unsigned long int) ((char *) next->next - (char *) NULL) 
     551        _heapinfo[block].busy.info.frag.first = (mg_u_long) 
     552          ((mg_u_long) ((char *) next->next - (char *) NULL) 
    553553           % BLOCKSIZE) >> log; 
    554554 
     
    871871      prev = (struct list *) ptr; 
    872872      _heapinfo[block].busy.info.frag.nfree = 1; 
    873       _heapinfo[block].busy.info.frag.first = (unsigned long int) 
    874         ((unsigned long int) ((char *) ptr - (char *) NULL) 
     873      _heapinfo[block].busy.info.frag.first = (mg_u_long) 
     874        ((mg_u_long) ((char *) ptr - (char *) NULL) 
    875875         % BLOCKSIZE >> type); 
    876876      prev->next = _fraghead[type].next; 
     
    12831283{ 
    12841284  __ptr_t result; 
    1285   unsigned long int adj; 
     1285  mg_u_long int adj; 
    12861286 
    12871287  size = ((size + alignment - 1) / alignment) * alignment; 
     
    12901290  if (result == NULL) 
    12911291    return NULL; 
    1292   adj = (unsigned long int) ((unsigned long int) ((char *) result - 
     1292  adj = (mg_u_long) ((mg_u_long) ((char *) result - 
    12931293                          (char *) NULL)) % alignment; 
    12941294  if (adj != 0) 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman.c

    r16583 r25147  
    3030 */ 
    3131huff_data * 
    32 Generate_Huffman_Data (int num, long *freqs, huff_data * data, 
    33                u_long * mem) 
     32Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 
     33               mg_u_long * mem) 
    3434{ 
    3535  int HNum, i, count; 
    36   unsigned long *heap; 
     36  mg_u_long *heap; 
    3737  huff_data *hd = data; 
    3838  if (!hd) 
     
    7373      if (heap[heap[curr - 1]] > heap[heap[child - 1]]) 
    7474        { 
    75           register u_long temp; 
     75          register mg_u_long temp; 
    7676          temp = heap[child - 1]; 
    7777          heap[child - 1] = heap[curr - 1]; 
     
    141141 
    142142  /* Calculate the code lens */ 
    143   heap[0] = -1UL; 
     143  heap[0] = -1; 
    144144  heap[1] = 0; 
    145145  for (i = 2; i < num * 2; i++) 
     
    154154  for (i = 0; i < num; i++) 
    155155    { 
    156       register u_long codelen = heap[i + num]; 
     156      register mg_u_long codelen = heap[i + num]; 
    157157      hd->clens[i] = (char) codelen; 
    158158      if (!codelen) 
     
    190190} 
    191191 
    192 unsigned long * 
    193 Generate_Huffman_Codes (huff_data * data, u_long * mem) 
     192mg_u_long * 
     193Generate_Huffman_Codes (huff_data * data, mg_u_long * mem) 
    194194{ 
    195195  int i; 
    196   unsigned long *codes; 
    197   unsigned long mc[MAX_HUFFCODE_LEN + 1]; 
     196  mg_u_long *codes; 
     197  mg_u_long mc[MAX_HUFFCODE_LEN + 1]; 
    198198 
    199199  if (!data) 
     
    212212 
    213213 
    214 unsigned long ** 
    215 Generate_Huffman_Vals (huff_data * data, u_long * mem) 
     214mg_u_long ** 
     215Generate_Huffman_Vals (huff_data * data, mg_u_long * mem) 
    216216{ 
    217217  int i; 
    218   unsigned long *fcode[MAX_HUFFCODE_LEN + 1]; 
    219   unsigned long **values; 
    220   unsigned long *vals; 
     218  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 
     219  mg_u_long **values; 
     220  mg_u_long *vals; 
    221221 
    222222  if (!data) 
     
    224224  if (!(vals = Xmalloc (data->num_codes * sizeof (*vals)))) 
    225225    return (NULL); 
    226   if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *)))) 
     226  if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)))) 
    227227    { 
    228228      free (vals); 
     
    230230    } 
    231231 
    232   bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *)); 
     232  bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 
    233233 
    234234  if (mem) 
    235235    *mem += data->num_codes * sizeof (*vals) + 
    236       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *); 
     236      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 
    237237 
    238238  fcode[0] = values[0] = &vals[0]; 
     
    249249 
    250250double  
    251 Calculate_Huffman_Size (int num, long *freqs, long *counts) 
     251Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts) 
    252252{ 
    253253  double size = 0; 
     
    321321static int  
    322322General_Read_Huffman_Data (size_t (*rd) (), void *f, 
    323                huff_data * hd, u_long * mem, u_long * disk) 
     323               huff_data * hd, mg_u_long * mem, mg_u_long * disk) 
    324324{ 
    325325  if (rd (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1) 
     
    392392 
    393393int  
    394 Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk) 
     394Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) 
    395395{ 
    396396  return General_Read_Huffman_Data (fread, f, hd, mem, disk); 
     
    401401 
    402402int  
    403 F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk) 
     403F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) 
    404404{ 
    405405  return General_Read_Huffman_Data (Fread, f, hd, mem, disk); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman.h

    r16583 r25147  
    3737    int maxcodelen; 
    3838    int lencount[MAX_HUFFCODE_LEN + 1]; 
    39     unsigned long min_code[MAX_HUFFCODE_LEN + 1]; 
     39    mg_u_long min_code[MAX_HUFFCODE_LEN + 1]; 
    4040    char *clens; 
    4141  } 
     
    4343 
    4444 
    45 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data, 
    46                   u_long * mem); 
     45huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 
     46                  mg_u_long * mem); 
    4747 
    48 unsigned long *Generate_Huffman_Codes (huff_data * data, u_long * mem); 
     48mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem); 
    4949 
    50 unsigned long **Generate_Huffman_Vals (huff_data * data, u_long * mem); 
     50mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem); 
    5151 
    5252int Write_Huffman_Data (FILE * f, huff_data * hd); 
    5353 
    54 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk); 
     54int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 
    5555 
    56 int F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk); 
     56int F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 
    5757 
    5858/* Calculate the number of bits required to code the data with the 
    5959   specified frequencies. Normally freqs and counts should point to 
    6060   the same array. */ 
    61 double Calculate_Huffman_Size (int num, long *freqs, long *counts); 
     61double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts); 
    6262 
    6363 
     
    6767    register int __i;                           \ 
    6868    register int __clen = (lens)[x];                    \ 
    69     register unsigned long __code = (codes)[x];             \ 
     69    register mg_u_long __code = (codes)[x];             \ 
    7070    for (__i=__clen-1; __i>=0; --__i)                   \ 
    7171      ENCODE_BIT((__code >> __i) & 1);                  \ 
     
    8181#define HUFF_DECODE(x, mcodes, values)                  \ 
    8282  do {                                  \ 
    83     register unsigned long *__min_code = (mcodes);          \ 
    84     register unsigned long *__mclen = __min_code;           \ 
    85     register unsigned long **__values = (values);           \ 
    86     register unsigned long __code = 0;                  \ 
     83    register mg_u_long *__min_code = (mcodes);          \ 
     84    register mg_u_long *__mclen = __min_code;           \ 
     85    register mg_u_long **__values = (values);           \ 
     86    register mg_u_long __code = 0;                  \ 
    8787    do                                  \ 
    8888      {                                 \ 
     
    9696#define HUFF_DECODE_L(x, mcodes, values, count)             \ 
    9797  do {                                  \ 
    98     register unsigned long *__min_code = (mcodes);          \ 
    99     register unsigned long *__mclen = __min_code;           \ 
    100     register unsigned long **__values = (values);           \ 
    101     register unsigned long __code = 0;                  \ 
     98    register mg_u_long *__min_code = (mcodes);          \ 
     99    register mg_u_long *__mclen = __min_code;           \ 
     100    register mg_u_long **__values = (values);           \ 
     101    register mg_u_long __code = 0;                  \ 
    102102    do                                  \ 
    103103      {                                 \ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_mem.c

    r16583 r25147  
    3030 
    3131void  
    32 BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes, 
     32BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes, 
    3333             char *clens, mem_bitio_state * bs) 
    3434{ 
     
    3838} 
    3939 
    40 unsigned long  
    41 BIO_Mem_Huff_Decode (unsigned long *mincodes, 
    42              unsigned long **values, mem_bitio_state * bs) 
     40mg_u_long  
     41BIO_Mem_Huff_Decode (mg_u_long *mincodes, 
     42             mg_u_long **values, mem_bitio_state * bs) 
    4343{ 
    44   unsigned long val; 
     44  mg_u_long val; 
    4545  DECODE_CONTINUE (*bs) 
    4646    HUFF_DECODE (val, mincodes, values); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_mem.h

    r16583 r25147  
    2525 
    2626 
    27 void BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes, 
     27void BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes, 
    2828              char *clens, mem_bitio_state * bs); 
    2929 
    30 unsigned long BIO_Mem_Huff_Decode (unsigned long *mincodes, 
    31                   unsigned long **values, mem_bitio_state * bs); 
     30mg_u_long BIO_Mem_Huff_Decode (mg_u_long *mincodes, 
     31                  mg_u_long **values, mem_bitio_state * bs); 
    3232 
    3333 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_stdio.c

    r16583 r25147  
    3333 
    3434void  
    35 BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes, 
     35BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes, 
    3636               char *clens, stdio_bitio_state * bs) 
    3737{ 
     
    4141} 
    4242 
    43 unsigned long  
    44 BIO_Stdio_Huff_Decode (unsigned long *mincodes, 
    45                unsigned long **values, 
     43mg_u_long  
     44BIO_Stdio_Huff_Decode (mg_u_long *mincodes, 
     45               mg_u_long **values, 
    4646               stdio_bitio_state * bs) 
    4747{ 
    48   unsigned long val; 
     48  mg_u_long val; 
    4949  DECODE_CONTINUE (*bs) 
    5050    HUFF_DECODE (val, mincodes, values); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_stdio.h

    r16583 r25147  
    2525 
    2626 
    27 void BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes, 
     27void BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes, 
    2828                char *clens, stdio_bitio_state * bs); 
    2929 
    3030 
    31 unsigned long BIO_Stdio_Huff_Decode (unsigned long *mincodes, 
    32                      unsigned long **values, 
     31mg_u_long BIO_Stdio_Huff_Decode (mg_u_long *mincodes, 
     32                     mg_u_long **values, 
    3333                     stdio_bitio_state * bs); 
    3434 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/longlong.h

    r16583 r25147  
    2222#ifndef H_LONGLONG 
    2323#define H_LONGLONG 
     24 
     25#include "mglong.h" 
    2426 
    2527#ifndef __WIN32__ 
     
    7173 
    7274/* Not using GCC, so fall back on plain "long" (32-bit) types */ 
    73 typedef unsigned long int mg_ullong; 
    74 typedef long int mg_llong; 
     75typedef uint32_t mg_ullong; 
     76typedef int32_t mg_llong; 
    7577 
    76 #define ULL_FS "lu" 
    77 #define LL_FS "ld" 
     78#define ULL_FS "u" 
     79#define LL_FS "d" 
    7880 
    7981#endif /* __GNUC__ */ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/messages.c

    r16583 r25147  
    2828 
    2929 
    30 void VOLATILE  
     30void 
    3131FatalError (int ExitCode, const char *fmt,...) 
    3232{ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/messages.h

    r16583 r25147  
    3131extern char *msg_prefix; 
    3232 
    33 void VOLATILE FatalError (int ExitCode, const char *fmt,...); 
     33void FatalError (int ExitCode, const char *fmt,...); 
    3434 
    3535void Message (const char *fmt,...); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/netorder.h

    r22257 r25147  
    1717#define HTOND(d)                                                                                  \ 
    1818        do {                                                                                      \ 
    19              unsigned long tmph, tmpl;                                                            \ 
     19             mg_u_long tmph, tmpl;                                                            \ 
    2020         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \ 
    2121         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \ 
     
    2727#define NTOHD(d)                                                                                  \ 
    2828        do {                                                                                      \ 
    29              unsigned long tmph, tmpl;                                                            \ 
     29             mg_u_long tmph, tmpl;                                                            \ 
    3030         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \ 
    3131         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \ 
     
    3737#define HTOND2(hd, nd)                                                                            \ 
    3838        do {                                                                                      \ 
    39              unsigned long tmph, tmpl;                                                            \ 
     39             mg_u_long tmph, tmpl;                                                            \ 
    4040         bcopy ((char *) &hd, (char *) &tmph, sizeof(double) >> 1);                           \ 
    4141         bcopy ((char *) &hd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \ 
     
    4747#define NTOHD2(nd, hd)                                                                            \ 
    4848        do {                                                                                      \ 
    49              unsigned long tmph, tmpl;                                                            \ 
     49             mg_u_long tmph, tmpl;                                                            \ 
    5050         bcopy ((char *) &nd, (char *) &tmph, sizeof(double) >> 1);                           \ 
    5151         bcopy ((char *) &nd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \ 
     
    5959#define HTONF(f)                                                                   \ 
    6060        do {                                                                       \ 
    61              unsigned long tmp;                                                    \ 
     61             mg_u_long tmp;                                                    \ 
    6262             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \ 
    6363             HTONUL (tmp);                                                         \ 
     
    6666#define NTOHF(f)                                                                   \ 
    6767        do {                                                                       \ 
    68              unsigned long tmp;                                                    \ 
     68             mg_u_long tmp;                                                    \ 
    6969             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \ 
    7070         NTOHUL (tmp);                                                         \ 
     
    7373#define HTONF2(hf, nf)                                                             \ 
    7474        do {                                                                       \ 
    75              unsigned long tmp;                                                    \ 
     75             mg_u_long tmp;                                                    \ 
    7676             bcopy ((char *) &(hf), (char *) &tmp, sizeof (float));                \ 
    7777             HTONUL (tmp);                                                         \ 
     
    8080#define NTOHF2(nf, hf)                                                             \ 
    8181        do {                                                                       \ 
    82              unsigned long tmp;                                                    \ 
     82             mg_u_long tmp;                                                    \ 
    8383             bcopy ((char *) &(nf), (char *) &tmp, sizeof (float));                \ 
    8484         NTOHUL (tmp);                                                         \ 
     
    115115 
    116116/* pointers */ 
    117 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p)) 
    118 #define NTOHP(p)          ((p) = (void *) ntohl ((unsigned long) p)) 
    119 #define HTONP2(hp, np)    ((np) = (void *) htonl ((unsigned long) hp)) 
    120 #define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((unsigned long) np)) 
     117#define HTONP(p)          ((p) = (void *) htonl ((mg_u_long) p)) 
     118#define NTOHP(p)          ((p) = (void *) ntohl ((mg_u_long) p)) 
     119#define HTONP2(hp, np)    ((np) = (void *) htonl ((mg_u_long) hp)) 
     120#define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((mg_u_long) np)) 
    121121 
    122122/* unsigned long */ 
     
    127127 
    128128/* signed long */ 
    129 #define HTONSL(l)         ((l) = (long) htonl ((unsigned long) (l))) 
    130 #define NTOHSL(l)         ((l) = (long) ntohl ((unsigned long) (l))) 
    131 #define HTONSL2(hl, nl)   ((nl) = (long) htonl ((unsigned long) (hl))) 
    132 #define NTOHSL2(nl, hl)   ((hl) = (long) ntohl ((unsigned long) (nl))) 
     129#define HTONSL(l)         ((l) = (mg_s_long) htonl ((mg_u_long) (l))) 
     130#define NTOHSL(l)         ((l) = (mg_s_long) ntohl ((mg_u_long) (l))) 
     131#define HTONSL2(hl, nl)   ((nl) = (mg_s_long) htonl ((mg_u_long) (hl))) 
     132#define NTOHSL2(nl, hl)   ((hl) = (mg_s_long) ntohl ((mg_u_long) (nl))) 
    133133 
    134134/* unsigned int */ 
    135 #define HTONUI(i)         ((i) = (unsigned int) htonl ((unsigned long) (i))) 
    136 #define NTOHUI(i)         ((i) = (unsigned int) ntohl ((unsigned long) (i))) 
    137 #define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((unsigned long) (hi))) 
    138 #define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((unsigned long) (ni))) 
     135#define HTONUI(i)         ((i) = (unsigned int) htonl ((mg_u_long) (i))) 
     136#define NTOHUI(i)         ((i) = (unsigned int) ntohl ((mg_u_long) (i))) 
     137#define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((mg_u_long) (hi))) 
     138#define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((mg_u_long) (ni))) 
    139139 
    140140/* signed int */ 
    141 #define HTONSI(i)         ((i) = (int) htonl ((unsigned long) (i))) 
    142 #define NTOHSI(i)         ((i) = (int) ntohl ((unsigned long) (i))) 
    143 #define HTONSI2(hi, ni)   ((ni) = (int) htonl ((unsigned long) (hi))) 
    144 #define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((unsigned long) (ni))) 
     141#define HTONSI(i)         ((i) = (int) htonl ((mg_u_long) (i))) 
     142#define NTOHSI(i)         ((i) = (int) ntohl ((mg_u_long) (i))) 
     143#define HTONSI2(hi, ni)   ((ni) = (int) htonl ((mg_u_long) (hi))) 
     144#define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((mg_u_long) (ni))) 
    145145 
    146146/* unsigned short */ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/perf_hash.c

    r16583 r25147  
    4242 
    4343/* Random Number stuff */ 
    44 static long seed[] = {0, 0}; 
     44static mg_s_long seed[] = {0, 0}; 
    4545#define RANDOM() irandm(seed) 
    4646#define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0) 
     
    105105 
    106106#ifndef STRUCT 
    107 static long **tb0, **tb1, **tb2; 
     107static mg_s_long **tb0, **tb1, **tb2; 
    108108#else 
    109109struct tb_entry **tb; 
     
    128128{               /* deletes edge e from list of v */ 
    129129 
    130   int b; 
    131  
     130  int b, norm_b; 
    132131  b = FIRST[v]; 
    133132  assert (norm (b) != 0); 
     
    700699    { 
    701700      if (tb0) 
    702     if (!(tb0[i] = Xmalloc (sizeof (long) * MAX_L))) 
     701    if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 
    703702        ok = 0; 
    704703      if (tb1) 
    705     if (!(tb1[i] = Xmalloc (sizeof (long) * MAX_L))) 
     704    if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 
    706705        ok = 0; 
    707706      if (tb2) 
    708     if (!(tb2[i] = Xmalloc (sizeof (long) * MAX_L))) 
     707    if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 
    709708        ok = 0; 
    710709    } 
     
    744743 
    745744  if (r <= 0) 
    746     SEED_RANDOM ((long) time ((time_t *) NULL)); 
     745    SEED_RANDOM ((mg_s_long) time ((time_t *) NULL)); 
    747746  else 
    748747    SEED_RANDOM (r); 
     
    907906    { 
    908907      if (phd->tb0) 
    909     if (!(phd->tb0[i] = Xmalloc (sizeof (long) * phd->MAX_L))) 
     908    if (!(phd->tb0[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 
    910909        ok = 0; 
    911910      if (phd->tb1) 
    912     if (!(phd->tb1[i] = Xmalloc (sizeof (long) * phd->MAX_L))) 
     911    if (!(phd->tb1[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 
    913912        ok = 0; 
    914913      if (phd->tb2) 
    915     if (!(phd->tb2[i] = Xmalloc (sizeof (long) * phd->MAX_L))) 
     914    if (!(phd->tb2[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 
    916915        ok = 0; 
    917916    } 
     
    951950      int j; 
    952951 
    953       tot += fread ((char *) phd->tb0[i], sizeof (long), phd->MAX_L, f) * 
     952      tot += fread ((char *) phd->tb0[i], sizeof (mg_s_long), phd->MAX_L, f) * 
    954953        sizeof (int); 
    955       tot += fread ((char *) phd->tb1[i], sizeof (long), phd->MAX_L, f) * 
     954      tot += fread ((char *) phd->tb1[i], sizeof (mg_s_long), phd->MAX_L, f) * 
    956955        sizeof (int); 
    957       tot += fread ((char *) phd->tb2[i], sizeof (long), phd->MAX_L, f) * 
     956      tot += fread ((char *) phd->tb2[i], sizeof (mg_s_long), phd->MAX_L, f) * 
    958957        sizeof (int); 
    959958 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/perf_hash.h

    r16583 r25147  
    2323#define H_PERF_HASH 
    2424 
    25  
    26  
     25#include "mglong.h" 
    2726 
    2827struct tb_entry 
    2928  { 
    30     long tb0, tb1, tb2; 
     29    mg_s_long tb0, tb1, tb2; 
    3130  }; 
    3231 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/random.c

    r16583 r25147  
    3333 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 
    3434 */ 
    35  
    36 #define MASK ((long) 593970775) 
     35#include "random.h" 
     36 
     37#define MASK ((mg_s_long) 593970775) 
    3738/*  or in hex, 23674657 */ 
    3839 
     
    4041/*  i.e. 2 to power -31 */ 
    4142 
    42 static long mt [128] =   { 
     43static mg_s_long mt [128] =   { 
    4344      902906369, 
    4445     2030498053, 
     
    172173 
    173174double  
    174 random (long is [2]) 
     175random (mg_s_long is [2]) 
    175176{ 
    176     long it, leh, nit; 
     177    mg_s_long it, leh, nit; 
    177178 
    178179    it = is [0]; 
     
    187188    is [0] = it;    is [1] = leh; 
    188189    if (leh < 0) leh = ~leh; 
    189     return (SCALE * ((long) (leh | 1))); 
     190    return (SCALE * ((mg_s_long) (leh | 1))); 
    190191} 
    191192 
    192193 
    193194 
    194 long  
    195 irandm (long is [2]) 
     195mg_s_long  
     196irandm (mg_s_long is [2]) 
    196197{ 
    197     long it, leh, nit; 
     198    mg_s_long it, leh, nit; 
    198199 
    199200    it = is [0]; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/random.h

    r16583 r25147  
    3636 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 
    3737 */ 
     38#include "mglong.h" 
    3839 
    39 double random (long is [2]); 
    40 long irandm (long is [2]); 
     40double random (mg_s_long is [2]); 
     41mg_s_long irandm (mg_s_long is [2]); 
    4142 
    4243#endif 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/regex.c

    r16583 r25147  
    28812881  register char *fastmap = bufp->fastmap; 
    28822882  unsigned char *pattern = bufp->buffer; 
    2883   unsigned long size = bufp->used; 
     2883  mg_u_long size = bufp->used; 
    28842884  unsigned char *p = pattern; 
    28852885  register unsigned char *pend = pattern + size; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/regex.h

    r16583 r25147  
    289289 
    290290    /* Number of bytes to which `buffer' points.  */ 
    291   unsigned long allocated; 
     291  mg_u_long allocated; 
    292292 
    293293    /* Number of bytes actually used in `buffer'.  */ 
    294   unsigned long used;    
     294  mg_u_long used;    
    295295 
    296296        /* Syntax setting with which the pattern was compiled.  */ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/rx.c

    r16583 r25147  
    611611 
    612612#ifdef __STDC__ 
    613 RX_DECL unsigned long 
     613RX_DECL mg_u_long 
    614614rx_bitset_hash (int size, rx_Bitset b) 
    615615#else 
    616 RX_DECL unsigned long 
     616RX_DECL mg_u_long 
    617617rx_bitset_hash (size, b) 
    618618     int size; 
     
    621621{ 
    622622  int x; 
    623   unsigned long hash = (unsigned long)rx_bitset_hash; 
     623  uintptr_t hash = (uintptr_t)rx_bitset_hash; 
    624624 
    625625  for (x = rx_bitset_numb_subsets(size) - 1; x >= 0; --x) 
     
    696696 
    697697 
    698 static unsigned long rx_hash_masks[4] = 
     698static mg_u_long rx_hash_masks[4] = 
    699699{ 
    700700  0x12488421, 
     
    709709RX_DECL struct rx_hash_item *  
    710710rx_hash_find (struct rx_hash * table, 
    711           unsigned long hash, 
     711          mg_u_long hash, 
    712712          void * value, 
    713713          struct rx_hash_rules * rules) 
     
    716716rx_hash_find (table, hash, value, rules) 
    717717     struct rx_hash * table; 
    718      unsigned long hash; 
     718     mg_u_long hash; 
    719719     void * value; 
    720720     struct rx_hash_rules * rules; 
     
    723723  rx_hash_eq eq = rules->eq; 
    724724  int maskc = 0; 
    725   long mask = rx_hash_masks [0]; 
     725  mg_s_long mask = rx_hash_masks [0]; 
    726726  int bucket = (hash & mask) % 13; 
    727727 
     
    750750RX_DECL struct rx_hash_item * 
    751751rx_hash_store (struct rx_hash * table, 
    752            unsigned long hash, 
     752           mg_u_long hash, 
    753753           void * value, 
    754754           struct rx_hash_rules * rules) 
     
    757757rx_hash_store (table, hash, value, rules) 
    758758     struct rx_hash * table; 
    759      unsigned long hash; 
     759     mg_u_long hash; 
    760760     void * value; 
    761761     struct rx_hash_rules * rules; 
     
    764764  rx_hash_eq eq = rules->eq; 
    765765  int maskc = 0; 
    766   long mask = rx_hash_masks[0]; 
     766  mg_s_long mask = rx_hash_masks[0]; 
    767767  int bucket = (hash & mask) % 13; 
    768768  int depth = 0; 
     
    798798    { 
    799799      struct rx_hash_item * them = table->buckets[bucket]; 
    800       unsigned long newmask = rx_hash_masks[maskc + 1]; 
     800      mg_u_long newmask = rx_hash_masks[maskc + 1]; 
    801801      while (them) 
    802802        { 
     
    850850    { 
    851851      struct rx_hash * table = it->table; 
    852       unsigned long hash = it->hash; 
     852      mg_u_long hash = it->hash; 
    853853      int depth = (table->parent 
    854854           ? (table->parent->parent 
     
    17641764         : (!vb 
    17651765        ? 1 
    1766         : ((long)a->car < (long)b->car 
     1766        : ((intptr_t)a->car < (intptr_t)b->car 
    17671767           ? 1 
    1768            : ((long)a->car > (long)b->car 
     1768           : ((intptr_t)a->car > (intptr_t)b->car 
    17691769              ? -1 
    17701770              : se_list_cmp ((void *)a->cdr, (void *)b->cdr)))))); 
     
    18311831#endif 
    18321832{ 
    1833   long hash = (long)car ^ (long)cdr; 
     1833  intptr_t hash = (intptr_t)car ^ (intptr_t)cdr; 
    18341834  struct rx_se_list template; 
    18351835 
     
    19441944  template.cdr = set; 
    19451945  node = rx_hash_store (memo, 
    1946             (((long)state) >> 8) ^ (long)set, 
     1946            (((intptr_t)state) >> 8) ^ (intptr_t)set, 
    19471947            &template, &nfa_set_hash_rules); 
    19481948  if (!node) 
     
    22512251RX_DECL int  
    22522252rx_compactify_nfa (struct rx *rx, 
    2253            void **mem, unsigned long *size) 
     2253           void **mem, mg_u_long *size) 
    22542254#else 
    22552255RX_DECL int  
     
    22572257     struct rx *rx; 
    22582258     void **mem; 
    2259      unsigned long *size; 
     2259     mg_u_long *size; 
    22602260#endif 
    22612261{ 
     
    22662266  int se_list_consc = count_hash_nodes (&rx->se_list_memo); 
    22672267  int nfa_setc = count_hash_nodes (&rx->set_list_memo); 
    2268   unsigned long total_size; 
     2268  mg_u_long total_size; 
    22692269 
    22702270  /* This takes place in two stages.   First, the total size of the 
     
    23942394          { 
    23952395        sp = rx_hash_find (&rx->se_list_memo, 
    2396                    (long)sesrc->car ^ (long)sesrc->cdr, 
     2396                   (intptr_t)sesrc->car ^ (intptr_t)sesrc->cdr, 
    23972397                   sesrc, &se_list_hash_rules); 
    23982398        if (sp->binding) 
     
    24122412          { 
    24132413        sp = rx_hash_find (&rx->set_list_memo, 
    2414                    ((((long)destlst->car) >> 8) 
    2415                     ^ (long)destlst->cdr), 
     2414                   ((((intptr_t)destlst->car) >> 8) 
     2415                    ^ (intptr_t)destlst->cdr), 
    24162416                   destlst, &nfa_set_hash_rules); 
    24172417        if (sp->binding) 
     
    27832783    (rx_hash_find 
    27842784     (&cache->superset_table, 
    2785       (unsigned long)set->car ^ set->id ^ (unsigned long)set->cdr, 
     2785      (intptr_t)set->car ^ set->id ^ (intptr_t)set->cdr, 
    27862786      (void *)set, 
    27872787      &cache->superset_hash_rules), 
     
    30403040    = ((struct rx_cache *) 
    30413041       ((char *)rules 
    3042     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules))); 
     3042    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules))); 
    30433043  struct rx_superset * template = (struct rx_superset *)val; 
    30443044  struct rx_superset * newset 
     
    30723072    = ((struct rx_cache *) 
    30733073       ((char *)rules 
    3074     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules))); 
     3074    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules))); 
    30753075  return ((struct rx_hash *) 
    30763076      rx_cache_malloc_or_get (cache, 
     
    30913091  struct rx_cache * cache 
    30923092    = ((struct rx_cache *) 
    3093        (char *)rules - (long)(&((struct rx_cache *)0)->superset_hash_rules)); 
     3093       (char *)rules - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)); 
    30943094  rx_cache_free (cache, &cache->free_hash, (char *)hash); 
    30953095} 
     
    32483248    template.id = car->id; 
    32493249    hit = rx_hash_store (&cache->superset_table, 
    3250              (unsigned long)car ^ car->id ^ (unsigned long)cdr, 
     3250             (intptr_t)car ^ car->id ^ (intptr_t)cdr, 
    32513251             (void *)&template, 
    32523252             &cache->superset_hash_rules); 
     
    43064306    return; 
    43074307      case r_side_effect: 
    4308     if (   ((long)rexp->params.side_effect >= 0) 
    4309         && (params [(long)rexp->params.side_effect].se == re_se_backref)) 
    4310       out[ params [(long)rexp->params.side_effect].op1] = 1; 
     4308    if (   ((intptr_t)rexp->params.side_effect >= 0) 
     4309        && (params [(intptr_t)rexp->params.side_effect].se == re_se_backref)) 
     4310      out[ params [(intptr_t)rexp->params.side_effect].op1] = 1; 
    43114311    return; 
    43124312      } 
     
    44874487      case r_side_effect: 
    44884488    { 
    4489       int se = (long)rexp->params.side_effect; 
     4489      int se = (intptr_t)rexp->params.side_effect; 
    44904490      if (   (se >= 0) 
    44914491          && (   ((enum re_side_effects)params[se].se == re_se_lparen) 
     
    45334533      return pointless_if_repeated (node->params.pair.left, params); 
    45344534    case r_side_effect: 
    4535       switch ((enum re_side_effects) (((long)node->params.side_effect < 0) 
    4536           ? (enum re_side_effects) (long) node->params.side_effect 
    4537           : (enum re_side_effects)params[(long)node->params.side_effect].se)) 
     4535      switch ((enum re_side_effects) (((intptr_t)node->params.side_effect < 0) 
     4536          ? (enum re_side_effects) (intptr_t) node->params.side_effect 
     4537          : (enum re_side_effects)params[(intptr_t)node->params.side_effect].se)) 
    45384538    { 
    45394539    case re_se_try: 
     
    45584558    case re_se_backref: 
    45594559      return 0; 
     4560    case re_se_pushback: 
     4561    case re_se_push0: 
     4562    case re_se_pushpos: 
     4563    case re_se_chkpos: 
     4564    case re_se_poppos: 
     4565    case re_se_tv: 
     4566    case re_floogle_flap: 
     4567      return -1; 
    45604568    } 
    45614569    case r_data: 
     
    46064614      case r_side_effect: 
    46074615    { 
    4608       int se = (long)rexp->params.side_effect; 
     4616      int se = (intptr_t)rexp->params.side_effect; 
    46094617      if (   in_danger 
    46104618          && (se >= 0) 
     
    47234731    case r_side_effect: 
    47244732      return 
    4725     !((long)rexp->params.side_effect > 0 
    4726       ? idempotent_complex_se [ params [(long)rexp->params.side_effect].se ] 
    4727       : idempotent_se [-(long)rexp->params.side_effect]); 
     4733    !((intptr_t)rexp->params.side_effect > 0 
     4734      ? idempotent_complex_se [ params [(intptr_t)rexp->params.side_effect].se ] 
     4735      : idempotent_se [-(intptr_t)rexp->params.side_effect]); 
    47284736       
    47294737    case r_alternate: 
     
    47764784 
    47774785    case r_side_effect: 
    4778       return ((long)rexp->params.side_effect >= 0); 
     4786      return ((intptr_t)rexp->params.side_effect >= 0); 
    47794787       
    47804788    case r_alternate: 
     
    51675175          if (need_sync) 
    51685176        { 
    5169           int sync_se = paramc; 
     5177          intptr_t sync_se = paramc; 
    51705178          params = (params 
    51715179                ? ((struct re_se_params *) 
     
    55155523            handle_close: 
    55165524              /* See similar code for backslashed left paren above.  */ 
    5517               if (COMPILE_STACK_EMPTY) 
    5518                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) 
     5525              if (COMPILE_STACK_EMPTY){ 
     5526                if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD){ 
    55195527                  goto normal_char; 
    5520                 else 
     5528        } 
     5529                else{ 
    55215530                  return REG_ERPAREN; 
     5531        } 
     5532          } 
    55225533 
    55235534              /* Since we just checked for an empty stack above, this 
     
    55365547                this_group_regnum = COMPILE_STACK_TOP.regnum; 
    55375548        { 
    5538           int left_se = paramc; 
    5539           int right_se = paramc + 1; 
     5549          intptr_t left_se = paramc; 
     5550          intptr_t right_se = paramc + 1; 
    55405551 
    55415552          params = (params 
     
    55885599        last_expression = &alt->params.pair.right; 
    55895600        { 
    5590           int sync_se = paramc; 
     5601          intptr_t sync_se = paramc; 
    55915602 
    55925603          params = (params 
     
    57055716          /* Otherwise, we have a nontrivial interval. */ 
    57065717          { 
    5707             int iter_se = paramc; 
    5708             int end_se = paramc + 1; 
     5718            intptr_t iter_se = paramc; 
     5719            intptr_t end_se = paramc + 1; 
    57095720            params = (params 
    57105721                  ? ((struct re_se_params *) 
     
    59025913 
    59035914          { 
    5904         int backref_se = paramc; 
     5915        intptr_t backref_se = paramc; 
    59055916        params = (params 
    59065917              ? ((struct re_se_params *) 
     
    59725983   
    59735984  { 
    5974     int win_se = paramc; 
     5985    intptr_t win_se = paramc; 
    59755986    params = (params 
    59765987          ? ((struct re_se_params *) 
     
    61126123      { 
    61136124    void * mem = (void *)rxb->buffer; 
    6114     unsigned long size = rxb->allocated; 
     6125    mg_u_long size = rxb->allocated; 
    61156126    int start_id; 
    61166127    char * perm_mem; 
     
    67146725  while (list) 
    67156726    { 
    6716       if ((long)list->car >= 0) 
     6727      if ((intptr_t)list->car >= 0) 
    67176728    ++x; 
    67186729      list = list->cdr; 
     
    67696780      for (ai = al - 1; ai >= 0; --ai) 
    67706781    { 
    6771       while ((long)ap->car < 0) 
     6782      while ((intptr_t)ap->car < 0) 
    67726783        ap = ap->cdr; 
    67736784      av[ai] = ap->car; 
     
    67776788      for (bi = bl - 1; bi >= 0; --bi) 
    67786789    { 
    6779       while ((long)bp->car < 0) 
     6790      while ((intptr_t)bp->car < 0) 
    67806791        bp = bp->cdr; 
    67816792      bv[bi] = bp->car; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/rx.h

    r16583 r25147  
    2222/*  t. lord Wed Sep 23 18:20:57 1992    */ 
    2323 
    24  
    25  
    26  
    27  
    28  
    29  
     24#include "mglong.h" 
    3025 
    3126#ifndef RX_WANT_SE_DEFS 
     
    8883  struct rx_hash_item * next_same_hash; 
    8984  struct rx_hash * table; 
    90   unsigned long hash; 
     85  mg_u_long hash; 
    9186  void * data; 
    9287  void * binding; 
     
    267262   */ 
    268263  void * buffer; 
    269   unsigned long allocated; 
     264  mg_u_long allocated; 
    270265 
    271266  /* Clients of RX can ask for some extra storage in the space pointed 
     
    274269   * at (buffer + allocated - reserved) 
    275270   */ 
    276   unsigned long reserved; 
     271  mg_u_long reserved; 
    277272 
    278273  /* --------- The remaining fields are for internal use only. --------- */ 
     
    12621257 
    12631258  void * buffer;        /* Malloced memory for the nfa. */ 
    1264   unsigned long allocated;  /* Size of that memory. */ 
     1259  mg_u_long allocated;  /* Size of that memory. */ 
    12651260 
    12661261  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses 
     
    15641559                      rx_Bitset a, rx_Bitset b); 
    15651560RX_DECL void rx_bitset_xor (int size, rx_Bitset a, rx_Bitset b); 
    1566 RX_DECL unsigned long rx_bitset_hash (int size, rx_Bitset b); 
     1561RX_DECL mg_u_long rx_bitset_hash (int size, rx_Bitset b); 
    15671562RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table, 
    1568                         unsigned long hash, 
     1563                        mg_u_long hash, 
    15691564                        void * value, 
    15701565                        struct rx_hash_rules * rules); 
    15711566RX_DECL struct rx_hash_item * rx_hash_store (struct rx_hash * table, 
    1572                          unsigned long hash, 
     1567                         mg_u_long hash, 
    15731568                         void * value, 
    15741569                         struct rx_hash_rules * rules); 
     
    16211616RX_DECL void rx_delete_epsilon_transitions (struct rx *rx); 
    16221617RX_DECL int rx_compactify_nfa (struct rx *rx, 
    1623                    void **mem, unsigned long *size); 
     1618                   void **mem, mg_u_long *size); 
    16241619RX_DECL void rx_release_superset (struct rx *rx, 
    16251620                  struct rx_superset *set); 
     
    16491644RX_DECL void rx_bitset_revdifference (); 
    16501645RX_DECL void rx_bitset_xor (); 
    1651 RX_DECL unsigned long rx_bitset_hash (); 
     1646RX_DECL mg_u_long rx_bitset_hash (); 
    16521647RX_DECL struct rx_hash_item * rx_hash_find (); 
    16531648RX_DECL struct rx_hash_item * rx_hash_store (); 
     
    22072202#endif /* not STDC_HEADERS */ 
    22082203 
    2209  
    22102204 
    22112205 
     
    23222316RX_DECL __inline__ int 
    23232317rx_search  (struct re_pattern_buffer * rxb, 
    2324         int startpos, 
     2318        intptr_t startpos, 
    23252319        int range, 
    23262320        int stop, 
     
    23392333        app_closure, regs, resume_state, save_state) 
    23402334     struct re_pattern_buffer * rxb; 
    2341      int startpos; 
     2335     intptr_t startpos; 
    23422336     int range; 
    23432337     int stop; 
     
    27172711  { 
    27182712    enum rx_test_match_entry test_pc; 
    2719     int inx; 
     2713    intptr_t inx; 
    27202714    test_pc = search_state.test_match_resume_pt; 
    27212715    if (test_pc == rx_test_start) 
     
    28172811            ((struct rx_superstate *) 
    28182812             ((char *)this_tr_table 
    2819               - ((unsigned long) 
     2813              - ((mg_u_long) 
    28202814             ((struct rx_superstate *)0)->transitions))); 
    28212815           
     
    28822876        ((struct rx_superstate *) 
    28832877         ((char *)this_tr_table 
    2884           - ((unsigned long) 
     2878          - ((uintptr_t) 
    28852879         ((struct rx_superstate *)0)->transitions))); 
    28862880    } 
     
    28892883     * Dispatch that instruction: 
    28902884     */ 
    2891     inx = (int)search_state.ifr->inx; 
     2885    inx = (intptr_t)search_state.ifr->inx; 
    28922886#ifdef RX_DEBUG_0 
    28932887    if (rx_debug_trace) 
     
    29272921          while (el) 
    29282922        { 
    2929           long effect; 
    2930           effect = (long)el->car; 
     2923          intptr_t effect; 
     2924          effect = (intptr_t)el->car; 
    29312925          if (effect < 0) 
    29322926            { 
     
    29682962                = ((struct rx_superstate *) 
    29692963                   ((char *)search_state.ifr->data 
    2970                 - (long)(((struct rx_superstate *)0) 
     2964                - (intptr_t)(((struct rx_superstate *)0) 
    29712965                     ->transitions))); 
    29722966              goto top_of_cycle; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.c

    r16583 r25147  
    293293        q->par = p;             \ 
    294294        q->rght = p->left;          \ 
    295         if(q->rght)             \ 
    296             q->rght->par = q;       \ 
     295        if(q->rght){                \ 
     296          q->rght->par = q;         \ 
     297        }                                       \ 
    297298        p->left = q;                \ 
    298         if(p->par)              \ 
    299             if(q == p->par->left)       \ 
    300                 p->par->left = p;   \ 
    301             else                \ 
    302                 p->par->rght = p;   \ 
     299        if(p->par){             \ 
     300          if(q == p->par->left){        \ 
     301            p->par->left = p;           \ 
     302          }                                     \ 
     303          else{                 \ 
     304            p->par->rght = p;           \ 
     305          }                                     \ 
     306        }                                       \ 
    303307    }while(0) 
    304308 
     
    308312        q->par = p;             \ 
    309313        q->left = p->rght;          \ 
    310         if(q->left)             \ 
    311             q->left->par = q;       \ 
     314        if(q->left){                \ 
     315          q->left->par = q;         \ 
     316        }                                       \ 
    312317        p->rght = q;                \ 
    313         if(p->par)              \ 
    314             if(q == p->par->left)       \ 
    315                 p->par->left = p;   \ 
    316             else                \ 
    317                 p->par->rght = p;   \ 
     318        if(p->par){             \ 
     319          if(q == p->par->left){        \ 
     320            p->par->left = p;           \ 
     321          }                                     \ 
     322          else{                             \ 
     323            p->par->rght = p;           \ 
     324          }                                     \ 
     325        }                                       \ 
    318326    }while(0) 
    319327 
     
    341349      if (p == q->left) 
    342350    { 
    343       if (g == NNULL) 
     351      if (g == NNULL){ 
    344352        ROTATER (p, q); 
     353      } 
    345354      else if (q == g->left) 
    346355        { 
     
    356365      else 
    357366    { 
    358       if (g == NNULL) 
     367      if (g == NNULL){ 
    359368        ROTATEL (p, q); 
     369      } 
    360370      else if (q == g->rght) 
    361371        { 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.h

    r16583 r25147  
    2929  { 
    3030    int no_of_items; 
    31     unsigned long mem_in_use; 
     31    mg_u_long mem_in_use; 
    3232    int (*cmp) (void *, void *); 
    3333    void *root; 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/unitool.c

    r23431 r25147  
    1515 * column 
    1616 */ 
    17 unsigned long *unicode_cat_data=NULL; 
     17mg_u_long *unicode_cat_data=NULL; 
    1818 
    1919 
     
    14641464 * column 
    14651465 */ 
    1466 unsigned long *unicode_cat_data; 
     1466mg_u_long *unicode_cat_data; 
    14671467 
    14681468void create_unicat_data () { 
     
    14701470  int min_start=0; 
    14711471  int min_end=0; 
    1472   register unsigned long min_value=0; /* filling the whole byte */ 
     1472  register mg_u_long min_value=0; /* filling the whole byte */ 
    14731473   
    14741474  const unirange *letter_here = letter_info; 
     
    15291529     
    15301530      } else { 
    1531     register unsigned long mask = 3 << ((i % 16) * 2); 
     1531    register mg_u_long mask = 3 << ((i % 16) * 2); 
    15321532    unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 
    15331533                  (min_value & mask); 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/win32in.c

    r16583 r25147  
    44/* unix systems. */ 
    55 
    6 unsigned long htonl(unsigned long x) { 
     6mg_u_long htonl(mg_u_long x) { 
    77#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 
    88    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | 
     
    2525} 
    2626 
    27 unsigned long ntohl(unsigned long x) { 
     27mg_u_long ntohl(mg_u_long x) { 
    2828#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 
    2929    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | 
     
    5151 
    5252main () { 
    53     long x; 
     53    mg_s_long x; 
    5454    short sx; 
    5555 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/win32in.h

    r16583 r25147  
    44#include "longlong.h" 
    55 
    6 unsigned long htonl(unsigned long x); 
    7 unsigned long ntohl(unsigned long x); 
     6mg_u_long htonl(mg_u_long x); 
     7mg_u_long ntohl(mg_u_long x); 
    88mg_ullong ntohll(mg_ullong x); 
    99unsigned short htons(unsigned short x); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/images/Makefile.in

    r16583 r25147  
    3636  
    3737CC = @CC@ 
    38 CFLAGS = @CFLAGS@  @COMPAT32BITFLAGS@ 
     38CFLAGS = @CFLAGS@ 
    3939CPPFLAGS = @CPPFLAGS@ 
    4040DEFS = @DEFS@ 
     
    4242INSTALL_DATA = @INSTALL_DATA@ 
    4343INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    44 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
     44LDFLAGS = @LDFLAGS@ 
    4545LIBS = ../../lib/libmglib.a @LIBS@ 
    4646TOUCH = echo timestamp > 
  • main/trunk/greenstone2/common-src/indexers/mg/src/images/mgfelics.c

    r16583 r25147  
    5555  FILE *fp_in = (stdin), *fp_out = (stdout); 
    5656  int width, height, maxval; 
    57   u_long magic; 
     57  mg_u_long magic; 
    5858  char *filename = NULL; 
    5959  unsigned int *line; 
  • main/trunk/greenstone2/common-src/indexers/mg/src/images/pbmtools.c

    r16583 r25147  
    6464pbm_isapbmfile (FILE * fp) 
    6565{ 
    66   u_long magic; 
     66  mg_u_long magic; 
    6767 
    6868  magic = getmagicno_short (fp); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/images/utils.c

    r16583 r25147  
    230230 
    231231void  
    232 magic_write (FILE * fp, u_long magic_num) 
     232magic_write (FILE * fp, mg_u_long magic_num) 
    233233{ 
    234234  HTONUL(magic_num);  /* [RPAP - Jan 97: Endian Ordering] */ 
     
    239239 
    240240void  
    241 magic_check (FILE * fp, u_long magic_num) 
    242 { 
    243   u_long magic; 
     241magic_check (FILE * fp, mg_u_long magic_num) 
     242{ 
     243  mg_u_long magic; 
    244244  if (fread (&magic, sizeof (magic), 1, fp) != 1 || NTOHUL(magic) != magic_num)  /* [RPAP - Jan 97: Endian Ordering] */ 
    245245    error_msg ("magic num", "Incorrect magic number.", ""); 
     
    247247 
    248248 
    249 u_long  
     249mg_u_long  
    250250magic_read (FILE * fp) 
    251251{ 
    252   u_long magic; 
     252  mg_u_long magic; 
    253253  if (fread (&magic, sizeof (magic), 1, fp) != 1) 
    254254    error_msg ("magic num", "Couldn't read magic number.", ""); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/images/utils.h

    r16583 r25147  
    4545#define MAGIC_BILEVEL           GEN_MAGIC('M','G','B','I') 
    4646#define MAGIC_TIC               GEN_MAGIC('M','G','T','C') 
    47 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 
     47#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 
    4848/* --------------------------------------- */ 
    4949 
     
    6868void readline (char str[], FILE * fp); 
    6969 
    70 void magic_write (FILE * fp, u_long magic_num); 
    71 void magic_check (FILE * fp, u_long magic_num); 
    72 u_long magic_read (FILE * fp); 
     70void magic_write (FILE * fp, mg_u_long magic_num); 
     71void magic_check (FILE * fp, mg_u_long magic_num); 
     72mg_u_long magic_read (FILE * fp); 
    7373/* kerry's code */ 
    7474 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

    r22070 r25147  
    3838AR = ar 
    3939CC = @CC@ 
    40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic 
     40CFLAGS = @CFLAGS@ -fpic 
    4141DEFS = @DEFS@ 
    4242RANLIB = @RANLIB@ 
     
    4444INSTALL_DATA = @INSTALL_DATA@ 
    4545INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    46 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
     46LDFLAGS = @LDFLAGS@ 
    4747LIBS = ../../lib/libmglib.a @LIBS@ 
    4848TOUCH = echo timestamp > 
     
    5353# Uncomment for compiling for the nzdl project 
    5454# 
    55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM 
     55CFLAGS = @CFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM 
    5656########################################## 
    5757 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.c

    r16583 r25147  
    4747 
    4848static File * 
    49 OpenFile (char *base, char *suffix, unsigned long magic, int *ok) 
     49OpenFile (char *base, char *suffix, mg_u_long magic, int *ok) 
    5050{ 
    5151  char FileName[512]; 
     
    6262  if (magic) 
    6363    { 
    64       unsigned long m; 
     64      mg_u_long m; 
    6565      if (fread ((char *) &m, sizeof (m), 1, F->f) == 0) 
    6666    { 
     
    475475  if (qd->id->ifh.InvfLevel == 3) 
    476476    { 
    477       unsigned long magic; 
     477      mg_u_long magic; 
    478478      FILE *paragraph; 
    479479      int i; 
     
    507507  { 
    508508    extern char *trec_ids; 
    509     extern long *trec_paras; 
     509    extern mg_s_long *trec_paras; 
    510510    int size; 
    511511    char FileName[512]; 
     
    533533      { 
    534534    int i, d; 
    535     unsigned long magic; 
    536     trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (long)); 
     535    mg_u_long magic; 
     536    trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (mg_s_long)); 
    537537    if (!trec_paras) 
    538538      { 
     
    598598 */ 
    599599void  
    600 ChangeMemInUse (query_data * qd, long delta) 
     600ChangeMemInUse (query_data * qd, mg_s_long delta) 
    601601{ 
    602602  qd->mem_in_use += delta; 
     
    775775} 
    776776 
    777 long  
     777mg_s_long  
    778778GetDocCompLength (query_data * qd) 
    779779{ 
     
    785785 
    786786u_char * 
    787 GetDocText (query_data * qd, unsigned long *len) 
     787GetDocText (query_data * qd, mg_u_long *len) 
    788788{ 
    789789  DocEntry *DE; 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.h

    r16583 r25147  
    4040  { 
    4141    File *InvfFile; 
    42     unsigned long N; 
    43     unsigned long Nstatic;  /* N parameter for decoding inverted file entries */ 
     42    mg_u_long N; 
     43    mg_u_long Nstatic;  /* N parameter for decoding inverted file entries */ 
    4444    struct invf_file_header ifh; 
    4545  } 
     
    5151    File *TextIdxFile; 
    5252    File *TextIdxWgtFile; 
    53     long current_pos; 
     53    mg_s_long current_pos; 
    5454    struct 
    5555      { 
    56     unsigned long Start; 
     56    mg_u_long Start; 
    5757    float Weight; 
    5858      } 
     
    7878    compression_dict_header cdh; 
    7979    comp_frags_header *cfh[2]; 
    80     unsigned long MemForCompDict; 
     80    mg_u_long MemForCompDict; 
    8181    u_char ***values[2]; 
    8282    u_char *escape[2]; 
    8383    huff_data *chars_huff[2]; 
    84     u_long **chars_vals[2]; 
     84    mg_u_long **chars_vals[2]; 
    8585    huff_data *lens_huff[2]; 
    86     u_long **lens_vals[2]; 
     86    mg_u_long **lens_vals[2]; 
    8787    auxiliary_dict *ad; 
    8888    int fast_loaded; 
     
    9696    struct stem_idx_header sih; 
    9797    u_char **index; 
    98     unsigned long *pos; 
     98    mg_u_long *pos; 
    9999    int active; 
    100100    u_char *buffer; 
    101     unsigned long MemForStemIdx; 
     101    mg_u_long MemForStemIdx; 
    102102  } 
    103103stemmed_idx; 
     
    109109    struct stem_dict_header sdh; 
    110110    u_char **index; 
    111     unsigned long *pos; 
     111    mg_u_long *pos; 
    112112    int active; 
    113113    u_char *buffer; 
    114     unsigned long MemForStemDict; 
     114    mg_u_long MemForStemDict; 
    115115 
    116116    /* [RPAP - Jan 97: Stem Index Change] */ 
     
    126126    double L; 
    127127    double B; 
    128     unsigned long *DocWeights; 
     128    mg_u_long *DocWeights; 
    129129    char bits; 
    130130    float *table; 
    131     unsigned long mask; 
    132     unsigned long MemForWeights; 
    133     unsigned long num_of_docs; 
     131    mg_u_long mask; 
     132    mg_u_long MemForWeights; 
     133    mg_u_long num_of_docs; 
    134134  } 
    135135approx_weights_data; 
     
    140140    int QueryFreqs; 
    141141    int Exact;           /* use exact weights for ranking or not */ 
    142     long MaxDocsToRetrieve; /* may be -1 for all */ 
    143     long MaxParasToRetrieve; 
     142    mg_s_long MaxDocsToRetrieve;    /* may be -1 for all */ 
     143    mg_s_long MaxParasToRetrieve; 
    144144    int Sort;         
    145145    char AccumMethod;       /* 'A' = array,  'S' = splay tree,  'H' = hash_table */ 
    146     long MaxAccums;     /* may be -1 for all */ 
    147     long MaxTerms;      /* may be -1 for all */ 
     146    mg_s_long MaxAccums;        /* may be -1 for all */ 
     147    mg_s_long MaxTerms;     /* may be -1 for all */ 
    148148    int StopAtMaxAccum; /* Stop at maximum accumulator or not */ 
    149     long HashTblSize; 
     149    mg_s_long HashTblSize; 
    150150    char *skip_dump; 
    151151  } 
     
    156156typedef struct BooleanQueryInfo 
    157157  { 
    158     long MaxDocsToRetrieve; 
     158    mg_s_long MaxDocsToRetrieve; 
    159159  } 
    160160BooleanQueryInfo; 
     
    191191    File *File_invf; 
    192192    File *File_weight_approx; 
    193     unsigned long mem_in_use, max_mem_in_use; 
    194     unsigned long num_of_ptrs, tot_num_of_ptrs; 
    195     unsigned long num_of_terms, tot_num_of_terms; 
    196     unsigned long num_of_accum, tot_num_of_accum; 
    197     unsigned long num_of_ans, tot_num_of_ans; 
    198     unsigned long hops_taken, tot_hops_taken; 
    199     unsigned long text_idx_lookups, tot_text_idx_lookups; 
    200     unsigned long max_buffers; 
     193    mg_u_long mem_in_use, max_mem_in_use; 
     194    mg_u_long num_of_ptrs, tot_num_of_ptrs; 
     195    mg_u_long num_of_terms, tot_num_of_terms; 
     196    mg_u_long num_of_accum, tot_num_of_accum; 
     197    mg_u_long num_of_ans, tot_num_of_ans; 
     198    mg_u_long hops_taken, tot_hops_taken; 
     199    mg_u_long text_idx_lookups, tot_text_idx_lookups; 
     200    mg_u_long max_buffers; 
    201201    unsigned doc_pos; 
    202202    unsigned buf_in_use; 
     
    226226query_data *InitQuerySystem (char *dir, char *name, char *textname, InitQueryTimes * iqt); 
    227227 
    228 void ChangeMemInUse (query_data * qd, long delta); 
     228void ChangeMemInUse (query_data * qd, mg_s_long delta); 
    229229 
    230230void FinishQuerySystem (query_data * qd); 
     
    251251float GetDocWeight (query_data * qd); 
    252252 
    253 long GetDocCompLength (query_data * qd); 
    254  
    255 u_char *GetDocText (query_data * qd, unsigned long *len); 
     253mg_s_long GetDocCompLength (query_data * qd); 
     254 
     255u_char *GetDocText (query_data * qd, mg_u_long *len); 
    256256 
    257257DocEntry *GetDocChain (query_data * qd); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_parser.c

    r16583 r25147  
    4444static QueryTermList **query_term_list; 
    4545static int word_num; 
    46 static u_long count; 
    47 static u_long doc_count; 
    48 static u_long invf_ptr; 
    49 static u_long invf_len; 
     46static mg_u_long count; 
     47static mg_u_long doc_count; 
     48static mg_u_long invf_ptr; 
     49static mg_u_long invf_len; 
    5050 
    5151#line 66 "bool_parser.y" 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_parser.y

    r16583 r25147  
    5757static QueryTermList **query_term_list; 
    5858static int word_num; 
    59 static u_long count; 
    60 static u_long doc_count; 
    61 static u_long invf_ptr; 
    62 static u_long invf_len; 
     59static mg_u_long count; 
     60static mg_u_long doc_count; 
     61static mg_u_long invf_ptr; 
     62static mg_u_long invf_len; 
    6363%} 
    6464  
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tester.c

    r16583 r25147  
    151151          prompt (str); 
    152152          te->WE.doc_count = atoi (line); 
    153           printf ("doc_count = %ld\n", te->WE.doc_count); 
     153          printf ("doc_count = %d\n", te->WE.doc_count); 
    154154        }           /*for */ 
    155155    }           /*if */ 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tree.c

    r16583 r25147  
    5656bool_tree_node * 
    5757CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num, 
    58             u_long count, u_long doc_count, u_long invf_ptr, u_long invf_len,  /* [RPAP - Feb 97: Term Frequency] */ 
     58            mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len,  /* [RPAP - Feb 97: Term Frequency] */ 
    5959            int stemmer_num)  
    6060{ 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tree.h

    r16583 r25147  
    102102bool_tree_node *CopyBoolTree (bool_tree_node * tree); 
    103103bool_tree_node *CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num, 
    104                     u_long count, u_long doc_count, u_long invf_ptr,  
    105                     u_long invf_len, int stemmer_num); 
     104                    mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr,  
     105                    mg_u_long invf_len, int stemmer_num); 
    106106bool_tree_node *CreateBoolTreeNode (N_Tag tag, 
    107107                 bool_tree_node * left, bool_tree_node * right); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/build.h

    r16583 r25147  
    111111 
    112112 
    113 extern unsigned long buf_size; 
     113extern mg_u_long buf_size; 
    114114/* 
    115115 * The size of the document input buffer. 
    116116 */ 
    117117 
    118 extern unsigned long ChunkLimit; 
     118extern mg_u_long ChunkLimit; 
    119119/* 
    120120 * The maximum number of chunks that can be written to disk. 
    121121 */ 
    122122 
    123 extern unsigned long invf_buffer_size; 
     123extern mg_u_long invf_buffer_size; 
    124124/* 
    125125 * The amount of memory to allocate to the invertion buffer. 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.c

    r16583 r25147  
    6666huff_data char_huff[2]; 
    6767huff_data lens_huff[2]; 
    68 u_long *char_codes[2], *lens_codes[2]; 
    69 u_long Words_disk = 0; 
    70 u_long Chars_disk = 0; 
     68mg_u_long *char_codes[2], *lens_codes[2]; 
     69mg_u_long Words_disk = 0; 
     70mg_u_long Chars_disk = 0; 
    7171 
    7272 
     
    7979  dict_hash_table *ht; 
    8080  u_char **words; 
    81   u_long ht_size; 
     81  mg_u_long ht_size; 
    8282 
    8383  ht_size = prime (cfh->hd.num_codes * HASH_RATIO); 
     
    133133      register u_char **wptr; 
    134134      register int tsize = ht->size; 
    135       register unsigned long hashval, step; 
     135      register mg_u_long hashval, step; 
    136136 
    137137      HASH (hashval, step, allwords, tsize); 
     
    163163    return COMPERROR; 
    164164 
    165   Words_disk = sizeof (u_long); 
     165  Words_disk = sizeof (mg_u_long); 
    166166 
    167167  if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1) 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.h

    r16583 r25147  
    3232typedef struct dict_hash_table 
    3333  { 
    34     u_long size; 
     34    mg_u_long size; 
    3535    huff_data *hd; 
    36     u_long *codes; 
     36    mg_u_long *codes; 
    3737    u_char **words; 
    3838    u_char **table[1]; 
     
    5151extern huff_data char_huff[2]; 
    5252extern huff_data lens_huff[2]; 
    53 extern u_long *char_codes[2], *lens_codes[2]; 
    54 extern u_long Words_disk; 
    55 extern u_long Chars_disk; 
     53extern mg_u_long *char_codes[2], *lens_codes[2]; 
     54extern mg_u_long Words_disk; 
     55extern mg_u_long Chars_disk; 
    5656 
    5757 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/environment.c

    r16583 r25147  
    347347 * or default on a error 
    348348 */ 
    349 long  
    350 IntEnv (char *data, long def) 
    351 { 
    352   long val; 
     349mg_s_long  
     350IntEnv (char *data, mg_s_long def) 
     351{ 
     352  mg_s_long val; 
    353353  char *ptr; 
    354354  if (!data) 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/environment.h

    r16583 r25147  
    5454char *GetEnvName (int i); 
    5555int BooleanEnv (char *data, int def); 
    56 long IntEnv (char *data, long def); 
     56mg_s_long IntEnv (char *data, mg_s_long def); 
    5757 
    5858void InitEnv (void); 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/hash.h

    r16583 r25147  
    3131    do {                        \ 
    3232        register u_char *p=wd;          \ 
    33         register long len = *p++;       \ 
    34         register unsigned long hval;        \ 
     33        register mg_s_long len = *p++;      \ 
     34        register mg_u_long hval;        \ 
    3535        if (len>25) len = 25;           \ 
    3636        for (hval=0; len; --len)        \ 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/invf.h

    r16583 r25147  
    3030struct invf_dict_header 
    3131  { 
    32     unsigned long lookback; 
    33     unsigned long dict_size; 
    34     unsigned long total_bytes; 
    35     unsigned long index_string_bytes; 
     32    mg_u_long lookback; 
     33    mg_u_long dict_size; 
     34    mg_u_long total_bytes;