Changeset 36 in svn


Ignore:
Timestamp:
2006-05-27T12:37:10+02:00 (9 years ago)
Author:
Xuefer
Message:

fix for fbsd

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r35 r36  
    1919
    2020$(XCACHE_PROC_H): $(XCACHE_PROC_OUT)
    21     $(GREP) -F 'export: ' $(XCACHE_PROC_OUT) | $(SED) -r 's/.*export:(.*):export.*/\1/g' | $(XCACHE_INDENT) > $(XCACHE_PROC_H).tmp
     21    $(GREP) -F 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' | $(XCACHE_INDENT) > $(XCACHE_PROC_H).tmp
    2222    mv -f $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H)
    2323
  • trunk/align.h

    r1 r36  
    11#ifndef __ALIGN_H
    22#define __ALIGN_H
     3#ifndef ALIGN
    34typedef union align_union {
    45    double d;
     
    1516
    1617#define ALIGN(n) ((((size_t)(n)-1) & ~(XCACHE_PLATFORM_ALIGNMENT-1)) + XCACHE_PLATFORM_ALIGNMENT)
    17 
     18#endif
    1819#endif /* __ALIGN_H */
  • trunk/config.m4

    r30 r36  
    6262  case $INDENT in
    6363  */indent[)]
    64     XCACHE_INDENT="$INDENT -kr --use-tabs --tab-size 4 -sob -nce"
     64    opts="-kr --use-tabs --tab-size 4 -sob -nce"
     65    if echo | $INDENT $opts > /dev/null 2>&1 ; then
     66      XCACHE_INDENT="$INDENT $opts"
     67    else
     68      opts="-sob -nce"
     69      if echo | $INDENT $opts > /dev/null 2>&1 ; then
     70        XCACHE_INDENT="$INDENT $opts"
     71      else
     72        if echo | $INDENT > /dev/null 2>&1 ; then
     73          XCACHE_INDENT="$INDENT"
     74        fi
     75      fi
     76    fi
    6577    ;;
    6678  *[)]
  • trunk/lock.c

    r11 r36  
    11#include <stdio.h>
    22#include <string.h>
    3 #include <malloc.h>
     3#include <stdlib.h>
    44
    55#include <php.h>
  • trunk/xcache.c

    r34 r36  
    77#include <string.h>
    88
    9 #include <malloc.h>
    109#include <signal.h>
    1110
Note: See TracChangeset for help on using the changeset viewer.