Skip to content

S
Software for White Rabbit PTP Core
Commit 4e6a3eab authored by Maciej Lipinski's avatar Maciej Lipinski
Browse files
Options

Merge branch 'rubi-190116' into proposed_master

parents 54d30793 1e5df6a8
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
dev/sdb-storage.c
View file @ 4e6a3eab
...@@ -435,7 +435,7 @@ int set_persistent_mac(uint8_t portnum, uint8_t *mac) ...@@ -435,7 +435,7 @@ int set_persistent_mac(uint8_t portnum, uint8_t *mac)
/* Erase SFB database in the memory */ /* Erase SFB database in the memory */
int32_t storage_sfpdb_erase(void) int storage_sfpdb_erase(void)
{ {
int ret; int ret;
......
include/std/inttypes.h
View file @ 4e6a3eab
...@@ -3,15 +3,24 @@ ...@@ -3,15 +3,24 @@
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
#ifndef _UINT32_T_DECLARED
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
#define _UINT32_T_DECLARED
#endif
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
typedef signed char int8_t; typedef signed char int8_t;
typedef signed short int16_t; typedef signed short int16_t;
#ifndef _INT32_T_DECLARED
typedef signed int int32_t; typedef signed int int32_t;
#define _INT32_T_DECLARED
#endif
typedef signed long long int64_t; typedef signed long long int64_t;
#ifndef _INTPTR_T_DECLARED
typedef unsigned long intptr_t; typedef unsigned long intptr_t;
#define _INTPTR_T_DECLARED
#endif
#define UINT32_MAX 4294967295U #define UINT32_MAX 4294967295U
......
liblinux/Makefile
View file @ 4e6a3eab
...@@ -10,6 +10,7 @@ LOBJ := devmap.o ...@@ -10,6 +10,7 @@ LOBJ := devmap.o
GIT_VER ?= $(shell git describe --always --dirty) GIT_VER ?= $(shell git describe --always --dirty)
GIT_USR ?= $(shell git config --get-all user.name) GIT_USR ?= $(shell git config --get-all user.name)
CC = cc
CFLAGS = -Wall -ggdb -fPIC -Werror -I./ -I../include CFLAGS = -Wall -ggdb -fPIC -Werror -I./ -I../include
CFLAGS += -D__GIT_VER__="\"$(GIT_VER)\"" -D__GIT_USR__="\"$(GIT_USR)\"" CFLAGS += -D__GIT_VER__="\"$(GIT_VER)\"" -D__GIT_USR__="\"$(GIT_USR)\""
LDFLAGS = -L. LDFLAGS = -L.
......
liblinux/extest/Makefile
View file @ 4e6a3eab
...@@ -9,6 +9,7 @@ GIT_USR =? $(shell git config --get-all user.name) ...@@ -9,6 +9,7 @@ GIT_USR =? $(shell git config --get-all user.name)
LIB = libextest.a LIB = libextest.a
LOBJ := extest.o LOBJ := extest.o
CC = cc
CFLAGS = -Wall -ggdb -fPIC -Werror -I./ CFLAGS = -Wall -ggdb -fPIC -Werror -I./
CFLAGS += -D__GIT_VER__="\"$(GIT_VER)\"" -D__GIT_USR__="\"$(GIT_USR)\"" CFLAGS += -D__GIT_VER__="\"$(GIT_VER)\"" -D__GIT_USR__="\"$(GIT_USR)\""
LDFLAGS = -L. -lextest LDFLAGS = -L. -lextest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment