Ticket #64624: debian_fix_2.patch

File debian_fix_2.patch, 2.4 KB (added by bradleyCPA (B. Holder), 3 years ago)
  • configure.ac

    old new for first in size_t int; do 
    146146#include <sys/types.h>
    147147#endif
    148148#include <unistd.h>
     149#include <stdio.h>
    149150#ifdef HAVE_GRP_H
    150151#include <grp.h>
    151152#endif
  • libfakeroot.c

    old new extern int unsetenv (const char *name); 
    198205#undef __lxstat64
    199206#undef _FILE_OFFSET_BITS
    200207
     208
     209#ifndef AT_EMPTY_PATH
     210#define AT_EMPTY_PATH 0
     211#endif
     212
     213#ifndef AT_NO_AUTOMOUNT
     214#define AT_NO_AUTOMOUNT 0
     215#endif
     216
    201217/*
    202218// next_wrap_st:
    203219// this structure is used in next_wrap, which is defined in
  • wrapawk_macosx

    old new BEGIN{ 
    4646  argtype=$3;
    4747  argname=$4;
    4848  MACRO=$5;
     49  argtype_def=$6
     50  if(!argtype_def) {
     51    argtype_def = argtype
     52  }
    4953  if(MACRO){
    5054    print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
    5155    print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);"   > structfile;
    5256    print "#undef " name                      > deffile
    5357    print "#define " name " MY_DEF(" name "_RAW)" > deffile
    5458
    55     print "extern " ret, name, argtype ";"              > tmpffile;
     59    print "extern " ret, name, argtype_def ";"          > tmpffile;
    5660    print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile;
    5761    print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile;
    5862    print "  return " name, argname ";"                 > tmpffile;
    5963    print "}"                                           > tmpffile;
    6064    print ""                                            > tmpffile;
    6165  } else {
    62     print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
     66    print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile;
    6367    print "#undef " name                                > structfile;
    6468    print "INTERPOSE(my_" name "," name ");"            > structfile;
    6569    print "#define " name " my_" name                   > structfile
    6670    print "#define " name " my_" name                   > deffile
    6771
    68     print "extern " ret, name, argtype ";"              > tmpffile;
     72    print "extern " ret, name, argtype_def ";"          > tmpffile;
    6973    if(argname){
    7074        print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile;
    7175        print "static __inline__ " ret " next_" name, argtype " {" > tmpffile;