rsc/source/rscpp/cpp2.c | 8 ++++----
rsc/source/rscpp/cpp3.c | 2 +-
rsc/source/rscpp/cpp4.c | 4 ++--
rsc/source/rscpp/cpp5.c | 14 +++++++-------
rsc/source/rscpp/cppdef.h | 9 ---------
5 files changed, 14 insertions(+), 23 deletions(-)
New commits:
commit 7fb97f25d16bd65fe8d32ca12c8b7acc89500991
Author: erdemdemirkapi <erdemdemirkapi.1...@gmail.com>
Date: Sun May 1 12:54:48 2016 +0300
rsc - remove obsolete FILE_LOCAL macros.
Change-Id: I92c19459646eaceffe87ef0f002c988595f221c5
Reviewed-on: https://gerrit.libreoffice.org/24549
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index 2108f09..833e687 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -305,7 +305,7 @@ int control(int counter)
* is always suppressed, so we don't need to evaluate anything. This
* suppresses unnecessary warnings.
*/
-FILE_LOCAL void doif(int hash)
+void doif(int hash)
{
int c;
int found;
@@ -358,7 +358,7 @@ FILE_LOCAL void doif(int hash)
* Note: the November 12 draft forbids '>' in the #include <file> format.
* This restriction is unnecessary and not implemented.
*/
-FILE_LOCAL void doinclude()
+void doinclude()
{
int c;
int delim;
@@ -406,7 +406,7 @@ FILE_LOCAL void doinclude()
* active files. Returns TRUE if the file was opened, FALSE
* if openinclude() fails. No error message is printed.
*/
-FILE_LOCAL int openinclude(char* filename, int searchlocal)
+int openinclude(char* filename, int searchlocal)
{
char** incptr;
char tmpname[NFWORK]; /* Filename work area */
@@ -500,7 +500,7 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal)
* node/device/directory part of the string is copied to result and
* hasdirectory returns TRUE. Else, nothing is copied and it returns FALSE.
*/
-FILE_LOCAL int hasdirectory(char* source, char* result, int max)
+int hasdirectory(char* source, char* result, int max)
{
#if HOST == SYS_UNIX
char* tp;
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index e836b3d..71c40fe 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -369,7 +369,7 @@ int readoptions(char* filename, char*** pfargv)
* This routine forces the -D and -U arguments to uppercase.
* It is called only on cpp startup by dooptions().
*/
-FILE_LOCAL void zap_uc(char* ap)
+void zap_uc(char* ap)
{
while (*ap != EOS)
{
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index eab7b15..6071076 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -465,7 +465,7 @@ void expand(DEFBUF* tokenp)
/*
* Collect the actual parameters for this macro. TRUE if ok.
*/
-FILE_LOCAL int expcollect()
+int expcollect()
{
int c;
int paren; /* For embedded ()'s */
@@ -533,7 +533,7 @@ FILE_LOCAL int expcollect()
/*
* Stuff the macro body, replacing formal parameters by actual parameters.
*/
-FILE_LOCAL void expstuff(DEFBUF* tokenp)
+void expstuff(DEFBUF* tokenp)
{
int c; /* Current character */
char* inp; /* -> repl string */
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index f383ab8..950830f 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -370,7 +370,7 @@ again:
* evalchar called to evaluate 'x'
* evalnum called to evaluate numbers.
*/
-FILE_LOCAL int evallex(int skip)
+int evallex(int skip)
{
int c;
int c1;
@@ -505,7 +505,7 @@ again:
* DIG success
* OP_FAIL bad parse or something.
*/
-FILE_LOCAL int dosizeof()
+int dosizeof()
{
int c;
TYPES* tp;
@@ -621,7 +621,7 @@ FILE_LOCAL int dosizeof()
/*
* TRUE if value is zero or exactly one bit is set in value.
*/
-FILE_LOCAL int bittest(int value)
+int bittest(int value)
{
/* whoaa!! really worried about non 2's complement machines...
* but not at all about cross-compiling ?
@@ -640,7 +640,7 @@ FILE_LOCAL int bittest(int value)
* Expand number for #if lexical analysis. Note: evalnum recognizes
* the unsigned suffix, but only returns a signed int value.
*/
-FILE_LOCAL int evalnum(int c)
+int evalnum(int c)
{
int value;
int base;
@@ -670,7 +670,7 @@ FILE_LOCAL int evalnum(int c)
value += c1;
c = cget();
}
- if (c == 'u' || c == 'U') /* Unsigned nonsense */
+ if (c == 'u' || c == 'U') /* Unsigned nonsense */
cget();
unget();
return value;
@@ -679,7 +679,7 @@ FILE_LOCAL int evalnum(int c)
/*
* Get a character constant
*/
-FILE_LOCAL int evalchar(int skip)
+int evalchar(int skip)
{
int c;
int value;
@@ -785,7 +785,7 @@ FILE_LOCAL int evalchar(int skip)
*
* evaleval() returns the new pointer to the top of the value stack.
*/
-FILE_LOCAL int * evaleval(int* valp, int op, int skip)
+int * evaleval(int* valp, int op, int skip)
{
int v1;
int v2 = 0;
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index 3cf30cf..ffbb57c 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.h
@@ -69,11 +69,6 @@
* This should be defined as "" if cpp is to replace
* the "standard" C pre-processor.
*
- * FILE_LOCAL marks functions which are referenced only in the
- * file they reside. Some C compilers allow these
- * to be marked "static" even though they are referenced
- * by "extern" statements elsewhere.
- *
* OK_DATE Predefines the compilation date if set TRUE.
* Not permitted by the Nov. 12, 1984 Draft Standard.
*
@@ -176,10 +171,6 @@
#endif
-#ifndef FILE_LOCAL
-#define FILE_LOCAL /* Others are global */
-#endif
-
#endif // INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
