1Change 22848094 by param@param-gcomm-server on 2011/07/29 11:51:00 *pending*
2
3	Make main in aes_tables hidable.
4
5	PRESUBMIT=passed
6	R=tschmelcher,jacobly
7	CC=a2a-mobile,third-party-owners
8	DELTA=7  (7 added, 0 deleted, 0 changed)
9	OCL=22848094
10	BUG=5096975
11
12Affected files ...
13
14... //depot/google3/third_party/libsrtp/README.google#9 edit
15... //depot/google3/third_party/libsrtp/tables/aes_tables.c#4 edit
16
17==== //depot/google3/third_party/libsrtp/README.google#9 - /home/param/sources/gcomm-server/google3/third_party/libsrtp/README.google ====
18# action=edit type=text
19--- google3/third_party/libsrtp/README.google	2011-07-22 15:49:10.000000000 -0700
20+++ google3/third_party/libsrtp/README.google	2011-08-08 11:37:50.000000000 -0700
21@@ -25,3 +25,7 @@
22 - Fixed a bug related to replay detection when sequence number rolls back
23   arround 0. (Currently contacting libsrtp developers for upstream.)
24 - Adding public.mk and Android.mk for building android flavour of libsrtp.
25+- Make main in tables/aes_tables.c hidable. If it is present, it conflicts
26+  with main in the application and cause link error when all_load flag is
27+  present for the linker command. Can be now hidden using flag
28+  HIDE_AES_TABLES_MAIN
29==== //depot/google3/third_party/libsrtp/tables/aes_tables.c#4 - /home/param/sources/gcomm-server/google3/third_party/libsrtp/tables/aes_tables.c ====
30# action=edit type=text
31--- google3/third_party/libsrtp/tables/aes_tables.c	2010-02-25 06:36:30.000000000 -0800
32+++ google3/third_party/libsrtp/tables/aes_tables.c	2011-07-29 11:52:25.000000000 -0700
33@@ -198,6 +198,8 @@
34
35 #define TABLES_32BIT 1
36
37+#ifndef HIDE_AES_TABLES_MAIN
38+
39 int
40 main(void) {
41   int i;
42@@ -309,6 +311,8 @@
43
44   return 0;
45 }
46+
47+#endif // HIDE_AES_TABLES_MAIN
48
49 #if AES_INVERSE_TEST
50
51