You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/11/14 00:18:36 UTC
svn commit: r1034905 - in /trafficserver/traffic/trunk:
libinktomi++/ink_config.h.in proxy/api/ts/ proxy/api/ts/ts.h.in proxy/config/
Author: zwoop
Date: Sat Nov 13 23:18:35 2010
New Revision: 1034905
URL: http://svn.apache.org/viewvc?rev=1034905&view=rev
Log:
TS-534 Move the TS_VERSION* defines to ts/ts.h.
Modified:
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/proxy/api/ts/ (props changed)
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
trafficserver/traffic/trunk/proxy/config/ (props changed)
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=1034905&r1=1034904&r2=1034905&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sat Nov 13 23:18:35 2010
@@ -38,14 +38,6 @@
*/
#include "ink_autoconf.h"
-/* Version info
- */
-#define TS_VERSION_STRING "@TS_VERSION_STRING@"
-#define TS_VERSION_NUMBER @TS_VERSION_NUMBER@
-#define TS_VERSION_MAJOR @TS_VERSION_MAJOR@
-#define TS_VERSION_MINOR @TS_VERSION_MINOR@
-#define TS_VERSION_MICRO @TS_VERSION_MICRO@
-
#define BUILD_MACHINE "@build_machine@"
#define BUILD_PERSON "@build_person@"
#define BUILD_GROUP "@build_group@"
Propchange: trafficserver/traffic/trunk/proxy/api/ts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 13 23:18:35 2010
@@ -0,0 +1 @@
+ts.h
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1034905&r1=1034904&r2=1034905&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Sat Nov 13 23:18:35 2010
@@ -30,6 +30,12 @@
#ifndef __INK_API_H__
#define __INK_API_H__
+/* GENERATED FILE WARNING! DO NOT EDIT ts.h
+ *
+ * You must modify ts.h.in instead.
+ *
+ */
+
#include <sys/types.h>
#include <stdint.h>
@@ -42,11 +48,13 @@ extern "C"
{
#endif /* __cplusplus */
-/* BIG TODO: This should be generated at configure / build time. I'll fix it in TS-521 */
-/* This define lets you do checks for Traffic Server build version, such as
- #if (TS_VERSION_NUMBER >= 0x2001000) */
-#undef TS_VERSION_NUMBER
-#define TS_VERSION_NUMBER 0x2001005L
+ /* Version info
+ */
+#define TS_VERSION_STRING "@TS_VERSION_STRING@"
+#define TS_VERSION_NUMBER @TS_VERSION_NUMBER@
+#define TS_VERSION_MAJOR @TS_VERSION_MAJOR@
+#define TS_VERSION_MINOR @TS_VERSION_MINOR@
+#define TS_VERSION_MICRO @TS_VERSION_MICRO@
#define INK_HTTP_VERSION(a,b) ((((a) & 0xFFFF) << 16) | ((b) & 0xFFFF))
#define INK_HTTP_MINOR(v) ((v) & 0xFFFF)
Propchange: trafficserver/traffic/trunk/proxy/config/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 13 23:18:35 2010
@@ -1,3 +1,4 @@
Makefile.in
Makefile
records.config
+storage.config