Changeset 5eb5dcf in mainline for uspace/lib/libblock


Ignore:
Timestamp:
2010-01-06T20:56:04Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fccc236
Parents:
002252a (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Location:
uspace/lib/libblock
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libblock/Makefile

    r002252a r5eb5dcf  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(LIBBLOCK)
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBBLOCK)
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/libblock/Makefile.build

    r002252a r5eb5dcf  
    5353%.o: %.c $(DEPEND)
    5454        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     55ifeq ($(PRECHECK),y)
     56        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     57endif
    5558
    5659$(DEPEND):

  • uspace/lib/libblock/Makefile.common

    r002252a r5eb5dcf  
    3434DEPEND = Makefile.depend
    3535DEPEND_PREV = $(DEPEND).prev
     36JOB = libblock.job
    3637LIBBLOCK = libblock.a

  • uspace/lib/libblock/libblock.c

    r002252a r5eb5dcf  
    4747#include <as.h>
    4848#include <assert.h>
    49 #include <fibril_sync.h>
     49#include <fibril_synch.h>
    5050#include <adt/list.h>
    5151#include <adt/hash_table.h>

  • uspace/lib/libblock/libblock.h

    r002252a r5eb5dcf  
    3636
    3737#ifndef LIBBLOCK_LIBBLOCK_H_
    38 #define LIBBLOCK_LIBBLOCK_H_
     38#define LIBBLOCK_LIBBLOCK_H_
    3939
    4040#include <stdint.h>
    4141#include "../../srv/vfs/vfs.h"
    42 #include <fibril_sync.h>
     42#include <fibril_synch.h>
    4343#include <adt/hash_table.h>
    4444#include <adt/list.h>
Note: See TracChangeset for help on using the changeset viewer.