From 0b8ab3fdafcf9cd8cc1f5387ad55c9f8bc325adb Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 7 Aug 2012 18:10:51 +0000 Subject: [PATCH] sa: rename print.c to printaddr.c to avoid conflict on symbian --- mk/symbian/re.mmp | 3 ++- mk/win32/re.vcproj | 5 ++++- src/sa/mod.mk | 2 +- src/sa/{print.c => printaddr.c} | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) rename src/sa/{print.c => printaddr.c} (94%) diff --git a/mk/symbian/re.mmp b/mk/symbian/re.mmp index a03b317..6ff41fd 100644 --- a/mk/symbian/re.mmp +++ b/mk/symbian/re.mmp @@ -42,6 +42,7 @@ SOURCE print.c SOURCE prm.c SOURCE regex.c SOURCE str.c +SOURCE str_error.c SOURCE time.c SOURCEPATH ..\..\src\hash @@ -109,7 +110,7 @@ SOURCE source.c SOURCEPATH ..\..\src\sa SOURCE ntop.c -SOURCE print.c +SOURCE printaddr.c SOURCE pton.c SOURCE sa.c diff --git a/mk/win32/re.vcproj b/mk/win32/re.vcproj index 13b4f2d..c9b4acf 100644 --- a/mk/win32/re.vcproj +++ b/mk/win32/re.vcproj @@ -203,6 +203,9 @@ + + @@ -475,7 +478,7 @@ RelativePath="..\..\src\sa\ntop.c"> + RelativePath="..\..\src\sa\printaddr.c"> diff --git a/src/sa/mod.mk b/src/sa/mod.mk index a4e95e9..78f05e0 100644 --- a/src/sa/mod.mk +++ b/src/sa/mod.mk @@ -5,6 +5,6 @@ # SRCS += sa/ntop.c -SRCS += sa/print.c +SRCS += sa/printaddr.c SRCS += sa/pton.c SRCS += sa/sa.c diff --git a/src/sa/print.c b/src/sa/printaddr.c similarity index 94% rename from src/sa/print.c rename to src/sa/printaddr.c index 5da482c..d7f23e7 100644 --- a/src/sa/print.c +++ b/src/sa/printaddr.c @@ -1,5 +1,5 @@ /** - * @file sa/print.c Socket Address printing + * @file sa/printaddr.c Socket Address printing * * Copyright (C) 2010 Creytiv.com */