HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
lib-src
/
ebrowse.c
diff --git
a/lib-src/ebrowse.c
b/lib-src/ebrowse.c
index
7871a80
..
a1fe10b
100644
(file)
--- a/
lib-src/ebrowse.c
+++ b/
lib-src/ebrowse.c
@@
-1,6
+1,6
@@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
/* ebrowse.c --- parsing files for the ebrowse C++ browser
-Copyright (C) 1992-201
1
Free Software Foundation, Inc.
+Copyright (C) 1992-201
2
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-20,11
+20,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#include <stdlib.h>
-#endif
-
#include <string.h>
#include <ctype.h>
#include <assert.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
@@
-49,16
+45,16
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* The character used as a separator in path lists (like $PATH). */
/* The character used as a separator in path lists (like $PATH). */
-#if defined(__MSDOS__)
+#if defined
(__MSDOS__)
#define PATH_LIST_SEPARATOR ';'
#define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y) (strcasecmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y) (strcasecmp
(X,Y) == 0)
#else
#else
-#if defined(WINDOWSNT)
+#if defined
(WINDOWSNT)
#define PATH_LIST_SEPARATOR ';'
#define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y) (stricmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y) (stricmp
(X,Y) == 0)
#else
#define PATH_LIST_SEPARATOR ':'
#else
#define PATH_LIST_SEPARATOR ':'
-#define FILENAME_EQ(X,Y) (streq(X,Y))
+#define FILENAME_EQ(X,Y) (streq
(X,Y))
#endif
#endif
/* The default output file name. */
#endif
#endif
/* The default output file name. */
@@
-985,7
+981,7
@@
make_namespace (char *name, struct sym *context)
}
}
-/* Find the symbol for namespace NAME. If not found, ret
ru
n NULL */
+/* Find the symbol for namespace NAME. If not found, ret
ur
n NULL */
static struct sym *
check_namespace (char *name, struct sym *context)
static struct sym *
check_namespace (char *name, struct sym *context)
@@
-2515,7
+2511,7
@@
member (struct sym *cls, int vis)
/* A function or class may follow. */
case TEMPLATE:
/* A function or class may follow. */
case TEMPLATE:
- MATCH();
+ MATCH
();
SET_FLAG (flags, F_TEMPLATE);
/* Skip over template argument list */
SKIP_MATCHING_IF ('<');
SET_FLAG (flags, F_TEMPLATE);
/* Skip over template argument list */
SKIP_MATCHING_IF ('<');
@@
-2934,7
+2930,7
@@
parse_qualified_ident_or_type (char **last_id)
}
while (enter--)
}
while (enter--)
- leave_namespace();
+ leave_namespace
();
return cls;
}
return cls;
}
@@
-3530,7
+3526,7
@@
static void
version (void)
{
/* Makes it easier to update automatically. */
version (void)
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 201
1
Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 201
2
Free Software Foundation, Inc.";
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);