dgaudet 98/03/17 11:38:45
Modified: src/include conf.h http_core.h
src/main http_core.c
Log:
need CORE_EXPORT_NONSTD for those which are called via function pointers
Revision Changes Path
1.193 +5 -1 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- conf.h 1998/03/17 13:08:54 1.192
+++ conf.h 1998/03/17 19:38:39 1.193
@@ -759,9 +759,13 @@
#define API_VAR_EXPORT
#endif
-/* modules should not used functions marked CORE_EXPORT */
+/* modules should not used functions marked CORE_EXPORT
+ * or CORE_EXPORT_NONSTD */
#ifndef CORE_EXPORT
#define CORE_EXPORT API_EXPORT
+#endif
+#ifndef CORE_EXPORT_NONSTD
+#define CORE_EXPORT_NONSTD API_EXPORT_NONSTD
#endif
/* So that we can use inline on some critical functions, and use
1.39 +1 -1 apache-1.3/src/include/http_core.h
Index: http_core.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- http_core.h 1998/03/17 07:54:12 1.38
+++ http_core.h 1998/03/17 19:38:40 1.39
@@ -242,7 +242,7 @@
/* for mod_perl */
CORE_EXPORT(void) add_per_dir_conf (server_rec *s, void *dir_config);
CORE_EXPORT(void) add_per_url_conf (server_rec *s, void *url_config);
-CORE_EXPORT(const char *) limit_section (cmd_parms *cmd, void *dummy, const
char *arg);
+CORE_EXPORT_NONSTD(const char *) limit_section (cmd_parms *cmd, void *dummy,
const char *arg);
#endif
1.175 +2 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- http_core.c 1998/03/17 08:20:57 1.174
+++ http_core.c 1998/03/17 19:38:42 1.175
@@ -876,7 +876,7 @@
return NULL;
}
-CORE_EXPORT(const char *) limit_section (cmd_parms *cmd, void *dummy, const
char *arg)
+CORE_EXPORT_NONSTD(const char *) limit_section (cmd_parms *cmd, void *dummy,
const char *arg)
{
const char *limited_methods = getword(cmd->pool,&arg,'>');
int limited = 0;
@@ -1864,7 +1864,7 @@
{ end_virtualhost_section, end_nested_section, NULL, RSRC_CONF, NO_ARGS,
"Marks end of <VirtualHost>" },
{ "<Files", filesection, NULL, OR_ALL, RAW_ARGS, "Container for directives
affecting files matching specified patterns" },
{ end_files_section, end_nested_section, NULL, OR_ALL, NO_ARGS, "Marks end
of <Files>" },
-{ "<Limit", (void*)limit_section, NULL, OR_ALL, RAW_ARGS, "Container for
authentication directives when accessed using specified HTTP methods" },
+{ "<Limit", limit_section, NULL, OR_ALL, RAW_ARGS, "Container for
authentication directives when accessed using specified HTTP methods" },
{ "</Limit>", endlimit_section, NULL, OR_ALL, NO_ARGS, "Marks end of
<Limit>" },
{ "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, "Container for
directives based on existance of specified modules" },
{ end_ifmodule_section, end_ifmod, NULL, OR_ALL, NO_ARGS, "Marks end of
<IfModule>" },
