Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portability Fixes #232

Merged
merged 1 commit into from
Sep 9, 2021
Merged

Portability Fixes #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ test
ylwrap
src_py/__pycache__
src_py/.deps
/configure~
1 change: 1 addition & 0 deletions src/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Makefile
Makefile.in
default.cvcrc
cvc.exe
cvc
autoscan*
8 changes: 4 additions & 4 deletions src/CvcTypes.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
#ifndef CVCTYPES_HH_
#define CVCTYPES_HH_

#include <stdint-gcc.h>
#include <cstdint>
#include <string>
#include <sstream>
#include <cstring>
#include <stdexcept>
#include <malloc.h>
#include <cstdlib>
#include <unordered_map>

#ifndef INT64_MAX
Expand Down Expand Up @@ -70,8 +70,8 @@ typedef int32_t eventKey_t;
#define DEFAULT_RESISTANCE "R"
#define DEFAULT_UNKNOWN_RESISTANCE 1100100

#define MAX_PARALLEL_CIRCUIT_PORT_LIMIT 10

#define MAX_PARALLEL_CIRCUIT_PORT_LIMIT 10
#define HIERARCHY_DELIMITER "/"
#define ALIAS_DELIMITER "~>"

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
CFLAGS = -O3
CXXFLAGS = -O3 -std=gnu++11
#LIBS = -lz -lreadline -lcurses -lhistory -lintl
LIBS = -lz -lreadline -lcurses -lhistory
LIBS = -lz -lreadline -lcurses -lhistory $(INTLLIBS)
LDFLAGS = -static-libstdc++ -static-libgcc

# this lists the binaries to produce, the (non-PHONY, binary) targets in
Expand Down