diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-08 15:10:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 13:57:51 -0400 |
| commit | 336aa21e37b6c5bd4f1215ceba27c21f6c43dce7 (patch) | |
| tree | aaad926928364865aec57e44b47d495ec2305332 | |
| parent | 150089cbd7445f76a5d29df7d33c15c3a1ada034 (diff) | |
| download | tor-336aa21e37b6c5bd4f1215ceba27c21f6c43dce7.tar.gz tor-336aa21e37b6c5bd4f1215ceba27c21f6c43dce7.zip | |
Move buffers.c and buffers_tls.c into src/common
These are no longer tor-specific, so they can be part of the
infrastructure.
| -rw-r--r-- | src/common/buffers.c (renamed from src/or/buffers.c) | 0 | ||||
| -rw-r--r-- | src/common/buffers.h (renamed from src/or/buffers.h) | 0 | ||||
| -rw-r--r-- | src/common/buffers_tls.c (renamed from src/or/buffers_tls.c) | 0 | ||||
| -rw-r--r-- | src/common/buffers_tls.h (renamed from src/or/buffers_tls.h) | 0 | ||||
| -rw-r--r-- | src/common/include.am | 4 | ||||
| -rw-r--r-- | src/or/include.am | 4 |
6 files changed, 4 insertions, 4 deletions
diff --git a/src/or/buffers.c b/src/common/buffers.c index 1a9144e14b..1a9144e14b 100644 --- a/src/or/buffers.c +++ b/src/common/buffers.c diff --git a/src/or/buffers.h b/src/common/buffers.h index 77cc9ce0fb..77cc9ce0fb 100644 --- a/src/or/buffers.h +++ b/src/common/buffers.h diff --git a/src/or/buffers_tls.c b/src/common/buffers_tls.c index e470738698..e470738698 100644 --- a/src/or/buffers_tls.c +++ b/src/common/buffers_tls.c diff --git a/src/or/buffers_tls.h b/src/common/buffers_tls.h index 4fce6c1130..4fce6c1130 100644 --- a/src/or/buffers_tls.h +++ b/src/common/buffers_tls.h diff --git a/src/common/include.am b/src/common/include.am index 1253888815..cd5eea3404 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -81,6 +81,7 @@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) LIBOR_A_SRC = \ src/common/address.c \ src/common/backtrace.c \ + src/common/buffers.c \ src/common/compat.c \ src/common/compat_threads.c \ src/common/compat_time.c \ @@ -110,6 +111,7 @@ src/common/src_common_libor_testing_a-log.$(OBJEXT) \ LIBOR_CRYPTO_A_SRC = \ src/common/aes.c \ + src/common/buffers_tls.c \ src/common/compress.c \ src/common/compress_lzma.c \ src/common/compress_none.c \ @@ -147,6 +149,8 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address.h \ src/common/backtrace.h \ + src/common/buffers.h \ + src/common/buffers_tls.h \ src/common/aes.h \ src/common/ciphers.inc \ src/common/compat.h \ diff --git a/src/or/include.am b/src/or/include.am index 6dc43749b7..021f5f9d5d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -20,8 +20,6 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake LIBTOR_A_SOURCES = \ src/or/addressmap.c \ src/or/bridges.c \ - src/or/buffers.c \ - src/or/buffers_tls.c \ src/or/channel.c \ src/or/channelpadding.c \ src/or/channeltls.c \ @@ -156,8 +154,6 @@ endif ORHEADERS = \ src/or/addressmap.h \ src/or/bridges.h \ - src/or/buffers.h \ - src/or/buffers_tls.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \ |