Quellcode durchsuchen

add .gitignore; support for building on a few BSD variants

ld
Sanjay Ghemawat vor 12 Jahren
Ursprung
Commit
015d26f8be
3 geänderte Dateien mit 31 neuen und 3 gelöschten Zeilen
  1. +5
    -0
      .gitignore
  2. +15
    -0
      build_detect_platform
  3. +11
    -3
      port/port_posix.h

+ 5
- 0
.gitignore Datei anzeigen

@ -0,0 +1,5 @@
build_config.mk
*.a
*.o
*_test
db_bench

+ 15
- 0
build_detect_platform Datei anzeigen

@ -39,6 +39,21 @@ case `uname -s` in
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk
echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
;; ;;
NetBSD)
PLATFORM=OS_NETBSD
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_NETBSD" >> build_config.mk
echo "PLATFORM_LDFLAGS=-lpthread -lgcc_s" >> build_config.mk
;;
OpenBSD)
PLATFORM=OS_OPENBSD
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_OPENBSD" >> build_config.mk
echo "PLATFORM_LDFLAGS=-pthread" >> build_config.mk
;;
DragonFly)
PLATFORM=OS_DRAGONFLYBSD
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_DRAGONFLYBSD" >> build_config.mk
echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
;;
*) *)
echo "Unknown platform!" echo "Unknown platform!"
exit 1 exit 1

+ 11
- 3
port/port_posix.h Datei anzeigen

@ -7,7 +7,7 @@
#ifndef STORAGE_LEVELDB_PORT_PORT_POSIX_H_ #ifndef STORAGE_LEVELDB_PORT_PORT_POSIX_H_
#define STORAGE_LEVELDB_PORT_PORT_POSIX_H_ #define STORAGE_LEVELDB_PORT_PORT_POSIX_H_
#if defined(OS_MACOSX) || defined(OS_FREEBSD)
#if defined(OS_MACOSX)
#include <machine/endian.h> #include <machine/endian.h>
#elif defined(OS_SOLARIS) #elif defined(OS_SOLARIS)
#include <sys/isa_defs.h> #include <sys/isa_defs.h>
@ -16,6 +16,10 @@
#else #else
#define BIG_ENDIAN #define BIG_ENDIAN
#endif #endif
#elif defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) ||\
defined(OS_DRAGONFLYBSD)
#include <sys/types.h>
#include <sys/endian.h>
#else #else
#include <endian.h> #include <endian.h>
#endif #endif
@ -33,13 +37,17 @@
#define IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) #define IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN)
#endif #endif
#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD)
#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD) ||\
defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD)
// Use fread/fwrite/fflush on platforms without _unlocked variants
#define fread_unlocked fread #define fread_unlocked fread
#define fwrite_unlocked fwrite #define fwrite_unlocked fwrite
#define fflush_unlocked fflush #define fflush_unlocked fflush
#endif #endif
#if defined(OS_MACOSX) || defined(OS_FREEBSD)
#if defined(OS_MACOSX) || defined(OS_FREEBSD) ||\
defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD)
// Use fsync() on platforms without fdatasync()
#define fdatasync fsync #define fdatasync fsync
#endif #endif

Laden…
Abbrechen
Speichern