Commit 80e545b7 authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

Global renaming of C header files to both get rid of conflicts with third

party packages and to again reach consistency:

Visible changes
---------------

1. conf.h -> ap_config.h:
   conflicted with conf.h files from 3rd party packages like SSLeay For
   backward compatibility a conf.h is still present but only holding an
   #include for ap_config.h.

2. conf_auto.h -> ap_config_auto.h
   to be consistent with conf.h rename because this belongs to ap_config.h.
   To backward compatibility needed because invented only a few days ago.

3. ap_config.h -> ap_config_auto.h
   this recently introduced header contains autogenerated defines similar to
   conf_auto.h, so provide them in ap_config_auto.h, too.  Backward
   compatibility is provided because ap_config.h (now the contents of conf.h)
   already includes ap_config_auto.h.

4. compat.h -> ap_compat.h:
   conflicted with compat.h files from 3rd party packages.  For backward
   compatibility a compat.h is still present but only holding an #include for
   ap_compat.h.

5. apctype.h -> ap_ctype.h:
   because Dean missed the newer ap_ naming convention when he comitted it
   recently but wants it now this way.  To backward compatibility needed
   because invented only a few days ago.

Background information
----------------------

o  The files were actually not renamed. They were copied (but not moved)
   inside the CVS repository and only removed for HEAD. This is important to
   both preserve the history with the new files and to be able to checkout
   older releases with the old files.

o  The MODULE_MAGIC_NUMBER was bumped up because the API changed.

o  The backward-compatibility headers were added to the source tree
   _after_ all things were changed and anything compiled fine again.
   So no dangling references to the old headers in the HEAD sources
   should exist. I also verified this via grep.

o  The backward-compatibility headers display a warning under GCC indicating
   that they are obsolete together with a hint which file should be used
   instead. Example:
   :> cc -o test test.c
   In file included from test.c:2:
   conf.h:6: warning: #warning "This header becomes obsolete, use ap_config.h instead"
   In file included from test.c:3:
   compat.h:6: warning: #warning "This header becomes obsolete, use ap_compat.h instead"

o  The dependencies in the Makefiles and the "distclean" target in
   src/Makefile.tmpl were updated accordingly.

o  Some C comments were also changed to now read "ap_config.h" instead
   of "conf.h", etc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81726 13f79535-47bb-0310-9956-ffa450edef68
parent d5a65c82
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment